Merge branch 'main' into 'dev/papelimp_tip3'

# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php

ci4/app/Language/en/App.php

@@ -669,10 +669,10 @@ return [
 
 
     // MENUS
-    "menu_dashboard" => "Dashboard",
+    "menu_dashboard" => "Control Panel",
 
     "menu_clientes" => "Customers",
-    "menu_tarifacliente" => "Customer Fee",
+    "menu_tarifacliente" => "Fees",
 
     "menu_configuration" => "Settings",
     "menu_calendario" => "Calendar",
@@ -692,22 +692,56 @@ return [
     "menu_trabajo" => "Works",
     "menu_trabajo" => "Tipologies",
 
-    "menu_digitalizacion" => "Digitalisation",  
+    "menu_mensajes" => "Messages",
+
+    "menu_maquetacion" => "Maquetación",
+
+    "menu_digitalizacion" => "Digitalisation",
+
+    "menu_importacion" => "Import",
+
+    "menu_catalogo" => "Catalogue",
+    "menu_catalogo_libros" => "Books",
+    "menu_catalogo_nuevo" => "New",
+    "menu_catalogo_categorias" => "Categories",
+    "menu_catalogo_categorias" => "Import",
   
     "menu_logistica" => "Logistics",
+    "menu_logistica_envios" => "Envíos conjuntos",
+    "menu_logistica_etiquetas" => "Labels",
+    "menu_logistica_tracking" => "Tracking",
+
+
+    "menu_compras" => "Procurement",
+    "menu_compras_ajustes" => "Settings",
+    "menu_productos" => "Products",
+    "menu_proveedores" => "Providers",
+
 
     "menu_facturación" => "Billing",
     "menu_albaran" => "Delivery notes",
     "menu_facturas" => "Invoices",
+    "menu_facturas_vencimiento" => "Vencimiento",
+    "menu_facturas_nueva" => "New Invoice",
 
     "menu_informes" => "Reports",
     
     "menu_pedidos" => "Orders",
+    "menu_pedidos_activos" => "Actives",
+    "menu_pedidos_finalizados" => "Finished",
+    "menu_pedidos_cancelados" => "Cancelled",
+    "menu_pedidos_manuales" => "Manual",
 
     "menu_presupuestos" => "Budgets",
+    "menu_presupuesto" => "Books",
     "menu_presupuestomaquetacion" => "Layout budgets",
 
     "menu_produccion" => "Production",
+    "menu_orden_trabajo" => "WOs",
+    "menu_orden_trabajo_100" => "WOs 100%",
+    "menu_orden_trabajo_finalizados" => "WOs finalised",
+    "menu_orden_trabajo_pendientes" => "WOs pending",
+
     "menu_ordentrabajomaquetacion" => "Layout work order",
     "menu_ordenmaquina" => "Machine order",
     "menu_pedidoproduccion" => "Orders",

ci4/app/Language/en/Users.php

@@ -4,7 +4,12 @@
 
 return [
 		'address' => 'Address',
-		'blocked' => 'Blocked',
+        'blocked' => 'Blocked',
+        'non_blocked' => 'Non Blocked',
+        'global_active' => 'Enabled',
+        'global_inactive' => 'Disabled',
+        'email_confirmed' => 'Confirmed',
+        'email_not_confirmed' => 'Non Confirmed',
 		'city' => 'City',
 		'country' => 'Country',
 		'createdAt' => 'Created At',