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}