Fix regression in language files

htdocs/langs/am_ET/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/ar_EG/propal.lang

@@ -44,7 +44,6 @@ RefProposal=مرجع العرض تجاري
 SendPropalByMail=إرسال عرض تجاري عن طريق البريد
 DatePropal=تاريخ العرض
 ValidityDuration=مدة الصلاحية
-CloseAs=اضبط الحالة على
 SetAcceptedRefused=مقبول / مرفوض
 ErrorPropalNotFound=العرض %s غير موجود
 AddToDraftProposals=أضف إلى مسودة العرض

htdocs/langs/ar_SA/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/az_AZ/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/bg_BG/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Продукти за производство
 UnitCost=Единична цена
 TotalCost=Обща цена
 BOMTotalCost=Разходите за производство на този списък с материали въз основа на разходите за всяко количество и продукт, които ще се използват (използвайте себестойност, ако е дефинирана, иначе средно претеглена цена, ако е определена, или най-добра покупна цена).
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/bn_BD/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/bn_IN/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/bs_BA/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/ca_ES/mrp.lang

@@ -1,7 +1,7 @@
-Mrp=Comandes de Fabricació
+Mrp=Ordres de fabricació
-MOs=Manufacturing orders
+MOs=Ordres de fabricació
-ManufacturingOrder=Comanda de fabricació
+ManufacturingOrder=Ordre de fabricació
-MRPDescription=Mòdul per gestionar ordres de producció i fabricació (MO).
+MRPDescription=Mòdul per gestionar Ordres de Fabricació o producció (OF).
 MRPArea=Àrea MRP
 MrpSetupPage=Configuració del mòdul MRP
 MenuBOM=Llistes de material
@@ -11,7 +11,7 @@ Bom=Llista de materials
 BillOfMaterials=Llista de material
 BOMsSetup=Configuració del mòdul BOM
 ListOfBOMs=Llista de factures de material - BOM
-ListOfManufacturingOrders=Llista de comandes de fabricació
+ListOfManufacturingOrders=Llista d'ordres de fabricació
 NewBOM=Nova llista de material
 ProductBOMHelp=Producte a crear amb aquest BOM. <br> Nota: els productes amb la propietat &quot;Natura del producte&quot; = &quot;Matèria primera&quot; no són visibles a aquesta llista.
 BOMsNumberingModules=Plantilles de numeració BOM
@@ -32,8 +32,8 @@ DeleteBillOfMaterials=Suprimeix la llista de materials
 DeleteMo=Eliminar Ordre de Fabricació
 ConfirmDeleteBillOfMaterials=Estàs segur que vols suprimir aquesta llista de material?
 ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta factura de material?
-MenuMRP=Comandes de Fabricació
+MenuMRP=Ordres de fabricació
-NewMO=Nova comanda de fabricació
+NewMO=Nova ordre de fabricació
 QtyToProduce=Quantitat per produir
 DateStartPlannedMo=Data d’inici prevista
 DateEndPlannedMo=Data prevista de finalització
@@ -76,3 +76,4 @@ ProductsToProduce=Productes a produir
 UnitCost=Cost unitari
 TotalCost=Cost total
 BOMTotalCost=El cost de produir aquesta Llista de materials en funció del cost de cada quantitat i producte a consumir (utilitza el preu de cost si està definit, altrament el preu mitjà ponderat si està definit, altrament el millor preu de compra)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/cs_CZ/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Výrobky k výrobě
 UnitCost=Jednotková cena
 TotalCost=Celkové náklady
 BOMTotalCost=Náklady na výrobu tohoto kusovníku na základě nákladů na každé spotřebované množství a produkt (použijte cenu Cena, pokud je definována, jinak průměrná vážená cena, pokud je definována, jinak nejlepší kupní cena)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/da_DK/mrp.lang

@@ -1,6 +1,6 @@
 Mrp=Fremstillingsordrer
 MOs=Manufacturing orders
-ManufacturingOrder=Fremstillingsordre
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Modul til styring af produktions- og produktionsordrer (MO).
 MRPArea=MRP-område
 MrpSetupPage=Opsætning af modul MRP
@@ -76,3 +76,4 @@ ProductsToProduce=Produkter til at producere
 UnitCost=Enhedspris
 TotalCost=Udgifter i alt
 BOMTotalCost=Omkostningerne til at fremstille denne BOM baseret på prisen for hver mængde og produkt, der skal forbruges (brug Prisen, hvis defineret, ellers Gennemsnit Vægtet pris, hvis defineret, ellers den bedste købspris)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/de_AT/members.lang

@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - members
 SetLinkToUser=Mit Benutzer verknüpfen
 SetLinkToThirdParty=Mit Partner verknüpfen
-MenuMembersNotUpToDate=Veraltete Mitglieder
 DateSubscription=Abonnierungsdatum
 DateEndSubscription=Abonnementauslaufdatum
 EndSubscription=Abonnementende

htdocs/langs/de_CH/admin.lang

@@ -507,7 +507,6 @@ TestGeoIPResult=Test einer Umwandlung IP -> Land
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
 NbMajMin=Mindestanzahl Grossbuchstaben
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
-ExpenseReportsIkSetup=Modul Spesenabrechnungen (Milles Index) einrichten
 ExpenseReportsRulesSetup=Modul Spesenabrechnungen (Regeln) einrichten
 ExpenseReportNumberingModules=Modul Spesenabrechnung (Numerierung)
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kannst automatische Benachrichtigungen im Modul "Benachrichtigungen" festlegen und verwalten.

htdocs/langs/de_CH/paybox.lang

@@ -6,6 +6,5 @@ SetupPayBoxToHavePaymentCreatedAutomatically=Paybox mit der URL <b>%s</b> einric
 YourPaymentHasBeenRecorded=Diese Seite bestätigt, dass Ihre Zahlung erfasst wurde. Vielen Dank.
 YourPaymentHasNotBeenRecorded=Hoppla, deine Zahlung wurde nicht ausgeführt und die Transaktion abgebrochen...
 PAYBOX_CGI_URL_V2=Url für das Paybox Zahlungsmodul "CGI Modul"
-VendorName=Name des Anbieters
 PAYBOX_PAYONLINE_SENDEMAIL=Email - Adresse für Zahlungsbestätigungen und -fehler
 PAYBOX_HMAC_KEY=HMAC - Schlüssel

htdocs/langs/de_DE/mrp.lang

@@ -1,5 +1,5 @@
 Mrp=Fertigungsaufträge
-MOs=Manufacturing orders
+MOs=Produktionsaufträge
 ManufacturingOrder=Fertigungsauftrag
 MRPDescription=Modul zur Verwaltung von Produktions- und Fertigungsaufträgen (MO).
 MRPArea=MRP Bereich
@@ -76,3 +76,4 @@ ProductsToProduce=Produkte zu produzieren
 UnitCost=Kosten pro Einheit
 TotalCost=Gesamtsumme Kosten
 BOMTotalCost=Die Herstellungskosten dieser Stückliste, basierend auf den Kosten jeder Menge und jeden verbrauchten Produktes (nutzt den Selbstkostenpreis wenn er definiert ist, ansonsten den Durchschnittspreis sofern definiert oder den besten Einkaufspreis)
+GoOnTabProductionToProduceFirst=Die Produktion muss begonnen sein, um einen Produktionsauftrag zu schließen (siehe Tab '%s'). Alternativ kann er storniert werden.

htdocs/langs/el_GR/mrp.lang

@@ -1,6 +1,6 @@
 Mrp=Παραγγελίες Παραγωγής
 MOs=Manufacturing orders
-ManufacturingOrder=Παραγγελία Παραγωγής
+ManufacturingOrder=Manufacturing Order
 MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Παραγγελιών Παραγωγής (MO).
 MRPArea=Περιοχή MRP
 MrpSetupPage=Ρύθμιση της μονάδας MRP
@@ -76,3 +76,4 @@ ProductsToProduce=Προϊόντα για παραγωγή
 UnitCost=Κόστος μονάδας
 TotalCost=Συνολικό κόστος
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/en_US/mrp.lang

@@ -75,10 +75,5 @@ ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
-<<<<<<< HEAD
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
 GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
- 
-=======
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) 
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git

htdocs/langs/es_AR/accountancy.lang

@@ -13,7 +13,6 @@ DefaultForProduct=Predeterminado para producto
 AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se hace desde el menú %s
 ConfigAccountingExpert=Experto en la configuración del módulo contabilidad
 Journalization=Contabilización
-Journaux=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura

htdocs/langs/es_AR/members.lang

@@ -19,7 +19,6 @@ MembersListResiliated=Lista de miembros terminados
 MembersListQualified=Lista de miembros calificados
 MenuMembersToValidate=Miembros en Borrador
 MenuMembersValidated=Miembros válidos
-MenuMembersNotUpToDate=Miembros vencidos
 MenuMembersResiliated=Miembros terminados
 MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir

htdocs/langs/es_AR/paybox.lang

@@ -16,7 +16,6 @@ YourPaymentHasBeenRecorded=Esta página confirma que su pago ha sido registrado.
 YourPaymentHasNotBeenRecorded=Su pago NO ha sido registrado y la transacción ha sido cancelada. Gracias.
 InformationToFindParameters=Ayuda para encontrar la información de su cuenta %s
 PAYBOX_CGI_URL_V2=URL del módulo CGI para pago con Paybox
-VendorName=Nombre del proveedor
 CSSUrlForPaymentForm=URL de hoja de estilo CSS para formulario de pago
 NewPayboxPaymentReceived=Nuevo pago de Paybox recibido
 NewPayboxPaymentFailed=Se intentó un nuevo pago de Paybox pero falló

htdocs/langs/es_CL/accountancy.lang

@@ -15,7 +15,6 @@ CantSuggest=No puedo sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayoría de las configuraciones de la contabilidad se realizan desde el menú %s
 ConfigAccountingExpert=Configuración del módulo Contabilidad Experta
 Journalization=Periodización
-Journaux=Revistas
 JournalFinancial=Diarios financieras
 BackToChartofaccounts=Volver al gráfico de cuentas
 Chartofaccounts=Gráfico de cuentas

htdocs/langs/es_CL/admin.lang

@@ -391,7 +391,6 @@ Module52Desc=Gestion de Stocks
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Gestión del código de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisk, ...)
-Module59Desc=Agregar función para generar una cuenta de Bookmark4u desde una cuenta de Dolibarr
 Module70Desc=Gestión de intervención
 Module75Name=Notas de gastos y viaje
 Module75Desc=Gestión de gastos y viajes
@@ -1277,7 +1276,6 @@ TypePaymentDesc=0: Tipo de pago del cliente, 1: Tipo de pago del proveedor, 2: T
 IncludePath=Incluir ruta (definida en la variable %s)
 ExpenseReportsSetup=Configuración del módulo Informes de gastos
 TemplatePDFExpenseReports=Plantillas de documentos para generar el documento de informe de gastos
-ExpenseReportsIkSetup=Configuración del módulo Informes de gastos: índice Milles
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de existencias. El aumento de existencias se realizará solo con la entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones por correo electrónico habilitando y configurando el módulo "Notificación".
 ListOfNotificationsPerUser=Lista de notificaciones automáticas por usuario *

htdocs/langs/es_CL/members.lang

@@ -18,8 +18,6 @@ MembersListUpToDate=Lista de miembros válidos con suscripción actualizada
 MembersListNotUpToDate=Lista de miembros válidos con suscripción fuera de fecha
 MembersListResiliated=Lista de miembros finalizados
 MembersListQualified=Lista de miembros calificados
-MenuMembersUpToDate=Miembros actualizados
-MenuMembersNotUpToDate=Miembros desactualizados
 MenuMembersResiliated=Miembros finalizados
 MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir

htdocs/langs/es_CL/stocks.lang

@@ -127,8 +127,6 @@ inventoryErrorQtyAdd=Error: una cantidad es menor que cero
 inventoryWarningProductAlreadyExists=Este producto ya está en la lista
 SelectCategory=Filtro de categoría
 SelectFournisseur=Filtro de proveedor
-INVENTORY_DISABLE_VIRTUAL=Producto virtual (kit): no disminuir el stock de un producto infantil
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilice el precio de compra si no se puede encontrar el último precio de compra
 inventoryChangePMPPermission=Permitir cambiar el valor de PMP para un producto
 OnlyProdsInStock=No agregue productos sin stock
 TheoricalQty=Cantidad teórica

htdocs/langs/es_CO/accountancy.lang

@@ -14,7 +14,6 @@ DefaultForProduct=Predeterminado para producto
 CantSuggest=No puedo sugerir
 ConfigAccountingExpert=Configuración del módulo experto en contabilidad.
 Journalization=Periodización
-Journaux=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Tabla de retorno de cuentas
 Chartofaccounts=Catálogo de cuentas

htdocs/langs/es_CO/admin.lang

@@ -330,7 +330,6 @@ Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Gestión de códigos de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
-Module59Desc=Agregar función para generar una cuenta Bookmark4u desde una cuenta Dolibarr
 Module70Desc=Gestión de la intervención
 Module75Name=Gastos y notas de viaje.
 Module75Desc=Gestión de gastos y notas de viaje.
@@ -1037,7 +1036,6 @@ Format=Formato
 IncludePath=Incluir ruta (definida en la variable %s)
 ExpenseReportsSetup=Configuración de los informes de gastos del módulo
 TemplatePDFExpenseReports=Plantillas de documentos para generar documentos de informe de gastos.
-ExpenseReportsIkSetup=Configuración de los informes de gastos del módulo - Índice Milles
 ExpenseReportsRulesSetup=Configuración de los informes de gastos del módulo - Reglas
 ExpenseReportNumberingModules=Módulo de numeración de informes de gastos.
 NoModueToManageStockIncrease=No se ha activado ningún módulo capaz de gestionar el aumento automático de stock. El aumento de stock se realizará solo con entrada manual.

htdocs/langs/es_EC/accountancy.lang

@@ -11,7 +11,6 @@ DefaultForService=Predeterminado para servicio
 CantSuggest=No puedo sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayoría de la configuración de la contabilidad se realiza desde el menú%s
 ConfigAccountingExpert=Configuración del experto en contabilidad de módulos
-Journaux=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retorno gráfico de cuentas
 Chartofaccounts=Catálogo de cuentas

htdocs/langs/es_EC/admin.lang

@@ -422,7 +422,6 @@ Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Administración de código de barras
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
-Module59Desc=Añadir función para generar una cuenta Bookmark4u desde una cuenta de Dolibarr
 Module60Name=Adhesivos
 Module60Desc=Manejo de adhesivos
 Module70Desc=Administración de la intervención

htdocs/langs/es_EC/members.lang

@@ -19,8 +19,6 @@ MembersListNotUpToDate=Lista de miembros válidos con suscripción desactualizad
 MembersListResiliated=Lista de miembros terminados
 MembersListQualified=Lista de miembros calificados
 MenuMembersToValidate=Miembros del draft
-MenuMembersUpToDate=Miembros actualizados
-MenuMembersNotUpToDate=Miembros fuera de fecha
 MenuMembersResiliated=Miembros terminados
 MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
 MembersWithSubscriptionToReceiveShort=Suscripción para recibir

htdocs/langs/es_EC/propal.lang

@@ -39,7 +39,6 @@ SendPropalByMail=Enviar propuesta comercial por correo
 DatePropal=Fecha de la propuesta
 DateEndPropal=Fecha de finalización de la validez
 ValidityDuration=Duración de la validez
-CloseAs=Establecer el estado en
 ErrorPropalNotFound=Propal%s no encontrado
 AddToDraftProposals=Añadir a proyecto de propuesta
 NoDraftProposals=Ningún proyecto de propuesta

htdocs/langs/es_EC/stocks.lang

@@ -139,8 +139,6 @@ inventoryErrorQtyAdd=Error: una cantidad es menor que cero
 inventoryWarningProductAlreadyExists=Este producto ya está en la lista
 SelectCategory=Filtro de categoría
 SelectFournisseur=Filtro de proveedores
-INVENTORY_DISABLE_VIRTUAL=Producto virtual (kit): no disminuya el stock de un producto hijo
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilice el precio de compra si no se puede encontrar el último precio de compra
 inventoryChangePMPPermission=Permitir cambiar el valor PMP de un producto
 OnlyProdsInStock=No añada producto sin inventario
 TheoricalQty=Cantidad teórica

htdocs/langs/es_ES/mrp.lang

@@ -1,5 +1,5 @@
 Mrp=Órdenes de fabricación
-MOs=Manufacturing orders
+MOs=Órdenes de fabricación
 ManufacturingOrder=Orden de fabricación
 MRPDescription=Módulo para gestionar producción y Órdenes de Fabricación (OF).
 MRPArea=Área MRP
@@ -76,3 +76,4 @@ ProductsToProduce=Productos para producir
 UnitCost=Costo unitario
 TotalCost=Coste total
 BOMTotalCost=El costo para producir esta Lista de Materiales en función del costo de cada cantidad y producto a consumir (use el precio de costo si está definido, de lo contrario, el precio promedio ponderado si está definido, o el mejor precio de compra)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/es_MX/ticket.lang

@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - ticket
-TicketTypeShortBUGSOFT=Malfuncionamiento del software
 Closed=Cerrada
 TicketSettings=Configuraciónes
 TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket con el que se comunicó. Aquí está el mensaje: <br>

htdocs/langs/es_PE/accountancy.lang

@@ -10,7 +10,6 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre del fichero
 DefaultForService=Servicio por defecto
 DefaultForProduct=Producto por defecto
 ConfigAccountingExpert=Configuración del módulo experto en contabilidad
-Journaux=Revistas
 JournalFinancial=Revistas financieras
 BackToChartofaccounts=Retornar gráfico de cuentas
 Selectchartofaccounts=Seleccione el plan de cuentas activo

htdocs/langs/es_PE/mrp.lang

@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - mrp
 Mrp=Órdenes de Fabricación
+MOs=Órdenes de Fabricación
 ManufacturingOrder=Orden de Fabricación
 MRPDescription=Modulo para gestionar la producción y órdenes de fabricación (OF).
 MRPArea=Área PRM

htdocs/langs/et_EE/mrp.lang

@@ -76,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/eu_ES/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/fa_IR/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=بخش برنامه‌ریزی مواد اولیه
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/fi_FI/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/fr_CA/members.lang

@@ -24,8 +24,6 @@ MembersListResiliated=Liste des membres licenciés
 MembersListQualified=Liste des membres qualifiés
 MenuMembersToValidate=Ébauche de membres
 MenuMembersValidated=Membres validés
-MenuMembersUpToDate=Membres à jour
-MenuMembersNotUpToDate=Membres périmés
 MenuMembersResiliated=Membres résiliés
 MembersWithSubscriptionToReceive=Membres avec abonnement à recevoir
 DateSubscription=Date de souscription

htdocs/langs/fr_CA/other.lang

@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - other
 NumberingShort=N °
-BirthdayDate=Date d'anniversaire
 BirthdayAlertOn=Alerte d'anniversaire active
 BirthdayAlertOff=Alerte d'anniversaire inactive
 PreviousMonthOfInvoice=Mois précédent (numéro 1-12) de la date de facturation

htdocs/langs/fr_CA/propal.lang

@@ -19,7 +19,6 @@ ActionsOnPropal=Événements sur proposition
 RefProposal=Référence de la proposition commerciale
 SendPropalByMail=Envoyer proposition commerciale par courriel
 DateEndPropal=Date de validité se terminant
-CloseAs=Définir l'état sur
 SetAcceptedRefused=Accepté/refusé
 ErrorPropalNotFound=Pas de proposition %s trouvées
 AddToDraftProposals=Ajouter un brouillon de proposition

htdocs/langs/fr_CA/stocks.lang

@@ -89,7 +89,6 @@ inventoryValidate=Validée
 inventoryDraft=Fonctionnement
 inventorySelectWarehouse=Choix d'entrepôt
 SelectCategory=Filtre de catégorie
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilisez le prix d'achat si aucun dernier prix d'achat ne peut être trouvé
 inventoryChangePMPPermission=Autoriser à modifier la valeur PMP pour un produit
 OnlyProdsInStock=Ne pas ajouter de produit sans stock
 TheoricalQty=Quantité théorique

htdocs/langs/fr_FR/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Ordres de fabrication
-<<<<<<< HEAD
+MOs=Ordres de fabrication
-MO=Ordre de fabrication
-MOs=Manufacturing orders
-=======
 ManufacturingOrder=Ordre de fabrication
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module de gestion de production et Ordres de Fabrication (OF).
 MRPArea=Espace MRP
 MrpSetupPage=Configuration du module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Produits à produire
 UnitCost=Coût unitaire
 TotalCost=Coût total
 BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
+GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler.

htdocs/langs/gl_ES/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Ordes de fabricación
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/he_IL/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/hi_IN/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/hr_HR/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/hu_HU/mrp.lang

@@ -1,10 +1,6 @@
-Mrp=Manufacturing Orders
+Mrp=Gyártási rendelések
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -36,7 +32,7 @@ DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Delete Manufacturing Order
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
 ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
+MenuMRP=Gyártási rendelések
 NewMO=New Manufacturing Order
 QtyToProduce=Qty to produce
 DateStartPlannedMo=Date start planned
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/id_ID/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Pesanan Manufaktur
-<<<<<<< HEAD
-MO=Pesanan manufaktur
 MOs=Manufacturing orders
-=======
+ManufacturingOrder=Manufacturing Order
-ManufacturingOrder=Pesanan manufaktur
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Modul untuk mengelola produksi dan Pesanan Manufaktur (MO).
 MRPArea=Area MRP
 MrpSetupPage=Pengaturan MRP modul
@@ -80,3 +76,4 @@ ProductsToProduce=Produk yang akan diproduksi
 UnitCost=Biaya satuan
 TotalCost=Total biaya
 BOMTotalCost=Biaya untuk menghasilkan BOM ini berdasarkan pada biaya setiap kuantitas dan produk yang akan dikonsumsi (gunakan harga Biaya jika ditentukan, selain itu Harga Rata-rata Tertimbang jika ditentukan, selain itu harga pembelian Terbaik)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/is_IS/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/it_IT/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Ordini di produzione
-<<<<<<< HEAD
-MO=Ordine di produzione
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Ordine di produzione
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Modulo per la gestione degli ordini di produzione (MO).
 MRPArea=MRP Area
 MrpSetupPage=Configurazione del modulo MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Prodotti da produrre
 UnitCost=Costo unitario
 TotalCost=Costo totale
 BOMTotalCost=Il costo per produrre questa distinta base in base al costo di ciascuna quantità e prodotto da consumare (utilizzare il prezzo di costo se definito, altrimenti il prezzo medio ponderato se definito, altrimenti il miglior prezzo di acquisto)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/ja_JP/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/ka_GE/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/km_KH/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/kn_IN/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/ko_KR/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/lo_LA/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/lt_LT/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/lv_LV/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Ražošanas pasūtījumi
-<<<<<<< HEAD
+MOs=Ražošanas pasūtījumi
-MO=Ražošanas pasūtījums
+ManufacturingOrder=Manufacturing Order
-MOs=Manufacturing orders
-=======
-ManufacturingOrder=Ražošanas pasūtījums
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Ražošanas un ražošanas pasūtījumu (MO) pārvaldības modulis.
 MRPArea=MRP apgabals
 MrpSetupPage=MRP moduļa iestatīšana
@@ -80,3 +76,4 @@ ProductsToProduce=Izgatavojamie produkti
 UnitCost=Vienības cena
 TotalCost=Kopējās izmaksas
 BOMTotalCost=Šīs BOM izgatavošanas izmaksas, pamatojoties uz katra patērētā daudzuma un produkta izmaksām (izmantojiet pašizmaksu, ja tā ir noteikta, cita - vidējā svērtā cena, ja ir noteikta, citur - labākā pirkuma cena).
+GoOnTabProductionToProduceFirst=Vispirms jums ir jāsāk ražošana, lai aizvērtu ražošanas pasūtījumu (sk. Cilni '%s'). Bet jūs varat to atcelt.

htdocs/langs/mk_MK/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/mn_MN/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/nb_NO/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Produksjonsordrer
-<<<<<<< HEAD
-MO=Produksjonsordre
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Produksjonsordre
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Modul for å administrere produksjons- og produksjonsordrer (PO).
 MRPArea=MRP-område
 MrpSetupPage=Oppsett av MRP-modul 
@@ -80,3 +76,4 @@ ProductsToProduce=Varer å produsere
 UnitCost=Enhetskostnad
 TotalCost=Totalkostnad
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/ne_NP/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/nl_BE/accountancy.lang

@@ -8,7 +8,6 @@ Selectformat=Selecteer het formaat voor het bestand
 ACCOUNTING_EXPORT_FORMAT=Selecteer het formaat voor het bestand
 ACCOUNTING_EXPORT_PREFIX_SPEC=Geef de prefix voor het bestand
 ConfigAccountingExpert=Configuratie van de module boekhouding expert
-Journaux=Dagboeken
 JournalFinancial=Financiële dagboeken
 BackToChartofaccounts=Geef kaart van accounts terug
 Selectchartofaccounts=Selecteer actieve grafieken van accounts

htdocs/langs/nl_BE/propal.lang

@@ -3,7 +3,6 @@ ProposalsOpened=Openstaande offertes
 ConfirmValidateProp=Weet u zeker dat u deze offerte met naam <b>%s</b> wilt valideren?
 LastModifiedProposals=Laatste %s gewijzigde offertes
 NoProposal=Geen offerte
-CloseAs=Zet de status op
 SetAcceptedRefused=Zet op goedgekeurd/geweigerd
 CreateEmptyPropal=Creëer een lege commerciële offerte uit de lijst van producten / diensten
 ConfirmClonePropal=Weet u zeker dat u deze offerte <b>%s</b> wilt klonen?

htdocs/langs/nl_BE/ticket.lang

@@ -5,8 +5,6 @@ Permission56003=Tickets verwijderen
 Permission56005=Bekijk tickets van alle externe partijen (niet effectief voor externe gebruikers, altijd beperkt tot de derde partij waarvan ze afhankelijk zijn)
 TicketDictCategory=Ticket - Groepen
 TicketDictSeverity=Ticket - Gradaties
-TicketTypeShortBUGSOFT=Software storing
-TicketTypeShortBUGHARD=Hardware storing
 TicketTypeShortISSUE=Probleem, bug of probleem
 TicketTypeShortREQUEST=Verander- of verbeteringsverzoek
 TicketTypeShortOTHER=Ander

htdocs/langs/nl_NL/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Productieorders
-<<<<<<< HEAD
-MO=Productieorder
 MOs=Manufacturing orders
-=======
+ManufacturingOrder=Manufacturing Order
-ManufacturingOrder=Productieorder
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module om productie- en productieorders (PO) te beheren.
 MRPArea=MRP-gebied
 MrpSetupPage=Installatie van module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Te produceren producten
 UnitCost=De kosten per eenheid
 TotalCost=Totale prijs
 BOMTotalCost=De kosten voor het produceren van deze stuklijst op basis van de kosten van elke hoeveelheid en elk te consumeren product (gebruik kostprijs indien gedefinieerd, anders gemiddelde gewogen prijs indien gedefinieerd, anders de beste aankoopprijs)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/pl_PL/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/pt_BR/admin.lang

@@ -420,7 +420,6 @@ Module57Name=Pagamentos por Débito Direto
 Module57Desc=Gerenciamento de pedidos de Débito Direto. Inclui a geração de arquivo SEPA para países europeus.
 Module58Name=CliqueParaDiscarl
 Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.)
-Module59Desc=Adicione uma função para gerar uma conta Bookmark4u de uma conta Dolibarr
 Module60Name=Adesivos
 Module60Desc=Gestão de adesivos
 Module70Desc=Gestor de Intervenções
@@ -1366,7 +1365,6 @@ TypePaymentDesc=0: tipo de pagamento do cliente, 1: tipo de pagamento do fornece
 IncludePath=Incluir caminho (definido na variável %s)
 ExpenseReportsSetup=Configuração do módulo de Relatórios de Despesas
 TemplatePDFExpenseReports=Modelos de documentos para gerar despesa documento de relatório
-ExpenseReportsIkSetup=Configuração do módulo Relatórios de Despesas - Índice de quilometragem
 ExpenseReportsRulesSetup=Configuração do módulo Relatórios de Despesas - Regras
 ExpenseReportNumberingModules=Módulo de numeração dos relatórios de despesas
 NoModueToManageStockIncrease=Nenhum módulo disponível foi ativado para gerenciar o aumento automático do estoque. O aumento do estoque será feito apenas de forma manual.

htdocs/langs/pt_BR/members.lang

@@ -15,8 +15,6 @@ MembersCards=Cartões de Membros
 MembersListUpToDate=Lista dos Membros válidos ao día de adesão
 MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão
 MembersListResiliated=Lista de membros encerrados
-MenuMembersUpToDate=Membros ao día
-MenuMembersNotUpToDate=Membros não ao día
 MenuMembersResiliated=Membros encerrados
 MembersWithSubscriptionToReceiveShort=Assinatura a receber
 DateSubscription=data filiação

htdocs/langs/pt_BR/other.lang

@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - other
 Tools=Ferramentas
 Birthday=Aniversário
-DateToBirth=Data de nascimento
 BirthdayAlertOn=Alerta de aniversário ativo
 BirthdayAlertOff=Alerta de aniversário desativado
 PreviousMonthOfInvoice=Mês anterior (número 1-12) da data da fatura

htdocs/langs/pt_BR/paybox.lang

@@ -15,7 +15,6 @@ AccountParameter=Parametros da conta
 UsageParameter=Parametros de uso
 InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
 PAYBOX_CGI_URL_V2=URL do Paybox CGI modulo para pagamento
-VendorName=Nome do vendedor
 CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
 NewPayboxPaymentReceived=Novo pagamento recebido Paybox
 NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu

htdocs/langs/pt_BR/propal.lang

@@ -34,7 +34,6 @@ RefProposal=Ref. Orçamento
 SendPropalByMail=Enviar Orçamento por E-mail
 DatePropal=Data da Proposta
 ValidityDuration=Validade da proposta
-CloseAs=Configurar status para
 SetAcceptedRefused=Configurar aceito/recusado
 AddToDraftProposals=Adicionar a projeto de proposta
 NoDraftProposals=Não há projetos de propostas

htdocs/langs/pt_BR/stocks.lang

@@ -119,7 +119,6 @@ inventoryOfWarehouse=Inventário para depósito: %s
 inventoryErrorQtyAdd=Erro: a quantidade é menor que zero
 SelectCategory=Filtro por categoria
 SelectFournisseur=Filtro de fornecedores
-INVENTORY_DISABLE_VIRTUAL=Produto virtual (kit): não diminua o estoque de um produto filho
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Os movimentos de estoque terão a data do estoque (em vez da data da validação do estoque)
 RecordedQty=Quant. gravada
 inventoryDeleteLine=Apagar linha

htdocs/langs/pt_BR/ticket.lang

@@ -7,7 +7,6 @@ TicketDictType=Tickets - Tipos
 TicketDictCategory=Tickets - Grupos
 TicketDictSeverity=Tickets - Gravidades
 TicketDictResolution=Ticket - Resolução
-TicketTypeShortBUGHARD=Mau funcionamento do hardware
 TicketTypeShortHELP=Pedido de ajuda funcional
 TicketTypeShortISSUE=Questão, bug ou problema
 TicketTypeShortREQUEST=Solicitação de alteração ou aprimoramento

htdocs/langs/pt_PT/mrp.lang

@@ -1,7 +1,6 @@
-<<<<<<< HEAD
 Mrp=Encomendas de Manufatura
-MO=Encomenda de Manufatura
 MOs=Manufacturing orders
+ManufacturingOrder=Encomenda de Manufatura
 MRPDescription=Módulo para gerir a produção e as «Encomendas de Manufatura» (EM).
 MRPArea=Área de MRP
 MrpSetupPage=Configuração do módulo MRP
@@ -14,22 +13,6 @@ BOMsSetup=Configuração do módulo de FM
 ListOfBOMs=Lista das faturas do material - FM
 ListOfManufacturingOrders=Lista das Encomendas de Manufaturação
 NewBOM=Nova fatura de material
-=======
-Mrp=Manufacturing Orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=Modelos de numeração de FM
 BOMsModelModule=Modelos de documento de FM
@@ -93,3 +76,4 @@ ProductsToProduce=Produtos para produzir
 UnitCost=Custo unitário
 TotalCost=Custo total
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/ro_RO/mrp.lang

@@ -1,7 +1,6 @@
-<<<<<<< HEAD
 Mrp=Comenzi de producţie
-MO=Comandă de producţie 
+MOs=Comenzi de producţie
-MOs=Manufacturing orders
+ManufacturingOrder=Comandă de producţie 
 MRPDescription=Modulul de gestionare a comenzilor de producție și fabricare (MO).
 MRPArea=Producţie
 MrpSetupPage=Configurare modul MRP
@@ -10,18 +9,6 @@ LatestBOMModified=Ultimele %s bonuri de consum modificate
 LatestMOModified=Ultimele %s Comenzi de producţie modificate
 Bom=Bonuri de consum
 BillOfMaterials=Bon de consum
-=======
-Mrp=Manufacturing Orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 BOMsSetup=Configurarea modulului BOM 
 ListOfBOMs=Listă bonuri de consum - BOM
 ListOfManufacturingOrders=Listă comenzi de producţie
@@ -89,3 +76,4 @@ ProductsToProduce=Produse de fabricat
 UnitCost=Cost unitar
 TotalCost=Cost total
 BOMTotalCost=Costul pentru fabricaţia acestui Bon de consum în funcție de costul fiecărei cantități și produs de consumat (utilizați Prețul de cost, dacă este definit, altfel Prețul mediu ponderat, dacă este definit, altfel cel mai bun preț de achiziție)
+GoOnTabProductionToProduceFirst=Mai întâi trebuie să fi început producția pentru a închide o Comandă de fabricație (Vezi fila '%s'). Puteți anula. 

htdocs/langs/ru_RU/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/sk_SK/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/sl_SI/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/sq_AL/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/sr_RS/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/sv_SE/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP-område
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/sw_SW/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/th_TH/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/tr_TR/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Üretim Emirleri
-<<<<<<< HEAD
-MO=Üretim Emri
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Üretim Emri
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Üretim ve Üretim Siparişlerini (MO) yönetmek için modül.
 MRPArea=MRP Alanı
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/uk_UA/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/uz_UZ/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/vi_VN/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Đơn đặt hàng sản xuất
-<<<<<<< HEAD
-MO=Đơn hàng sản xuất
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Đơn hàng sản xuất
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=Khu vực MRP
 MrpSetupPage=Thiết lập mô-đun MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/zh_CN/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/zh_HK/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=Manufacturing Orders
-<<<<<<< HEAD
-MO=Manufacturing Order
 MOs=Manufacturing orders
-=======
 ManufacturingOrder=Manufacturing Order
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -80,3 +76,4 @@ ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.

htdocs/langs/zh_TW/mrp.lang

@@ -1,10 +1,6 @@
 Mrp=製造訂單
-<<<<<<< HEAD
+MOs=製造訂單
-MO=製造訂單
-MOs=Manufacturing orders
-=======
 ManufacturingOrder=製造訂單
->>>>>>> branch '12.0' of git@github.com:Dolibarr/dolibarr.git
 MRPDescription=管理生產和製造訂單（MO）的模組。
 MRPArea=MRP區域
 MrpSetupPage=MRP模組設定
@@ -80,3 +76,4 @@ ProductsToProduce=生產的產品
 UnitCost=單位成本
 TotalCost=總計花費
 BOMTotalCost=根據每個要消耗的數量和產品的成本產生此BOM的成本（如果定義則使用“成本價”，如果定義則使用“平均加權價格”，否則使用“最佳採購價”）
+GoOnTabProductionToProduceFirst=您必須先開始生產才能關閉生產訂單（請參見分頁“ %s”）。但是您可以取消它。