pcm-shared-components 2.1.149 → 2.1.151

package/dist/languages/en/translations.json

@@ -52,27 +52,6 @@
 		"billing": {
 			"billing": "Billing"
 		},
-		"date_time_display": {
-			"date_display_format_title": "Date Display Format",
-			"date_display_format_label": "Date Display Format",
-			"time_display_format_title": "Time Display Format",
-			"time_display_format_label": "Time Display Format",
-			"preview_label": "Preview",
-			"date_display_format_description": "Applies display-only formatting across reservation dates, calendars, and reports without changing stored values.",
-			"time_display_format_description": "Controls how time appears throughout the app. Default is 24-hour format.",
-			"date_formats": {
-				"iso": "ISO (2026-03-24)",
-				"us": "US (03/24/2026)",
-				"eu": "EU (24/03/2026)",
-				"long": "Long (Mar 24, 2026)",
-				"long_with_weekday": "Long with weekday (Tuesday, Mar 24, 2026)",
-				"short": "Short (Mar 24)"
-			},
-			"time_formats": {
-				"h24": "24-hour",
-				"h12": "12-hour (AM/PM)"
-			}
-		},
 		"booking_cutoff": {
 			"cutoff_day": "Allow After Midnight - Should the guests still be able to book for today even after midnight?",
 			"description": "Choose what time guests can no longer book for today.\nExtend this past midnight (e.g., 2:00 AM) for late-night arrivals.",
@@ -107,8 +86,8 @@
 			"client_side_parameters_allow_online_payments": "Allows online reservations to make online payment from the online client account.",
 			"client_side_parameters_google_measurement_id": "Google Measurement ID",
 			"client_side_parameters_google_measurement_info": "The Google Analytics Measurement ID, a unique identifier assigned to your booking page, facilitates the collection of crucial data on your clients' activities. This data is invaluable for optimizing your online booking experience, gaining insights into customer behavior, and comprehending various aspects such as cart abandonments. ",
-			"client_side_parameters_parallax_image_help": "Upload an image to serve as the background for your online booking portal.",
 			"client_side_parameters_is_length_filter_enabled": "Enables or disables the equipment length filter on the client side booking page.",
+			"client_side_parameters_parallax_image_help": "Upload an image to serve as the background for your online booking portal.",
 			"client_side_parameters_reservation_deposit": "Online reservation deposit %",
 			"client_side_parameters_reservation_deposit_description": "This is the deposit percentage that will be charged for an online reservation.  Can be between 0 and 100 percent of the reservation total.",
 			"mute_notifications": "If muted then no sound will be played when new notifications are received.",
@@ -134,6 +113,27 @@
 		"connected_account": {
 			"not_enabled_message": "Your account is not properly configured with Stripe/Online connected accounts.  To enable this feature please setup your account."
 		},
+		"date_time_display": {
+			"date_display_format_description": "Applies display-only formatting across reservation dates, calendars, and reports without changing stored values.",
+			"date_display_format_label": "Date Display Format",
+			"date_display_format_title": "Date Display Format",
+			"date_formats": {
+				"eu": "EU (24/03/2026)",
+				"iso": "ISO (2026-03-24)",
+				"long": "Long (Mar 24, 2026)",
+				"long_with_weekday": "Long with weekday (Tuesday, Mar 24, 2026)",
+				"short": "Short (Mar 24)",
+				"us": "US (03/24/2026)"
+			},
+			"preview_label": "Preview",
+			"time_display_format_description": "Controls how time appears throughout the app. Default is 24-hour format.",
+			"time_display_format_label": "Time Display Format",
+			"time_display_format_title": "Time Display Format",
+			"time_formats": {
+				"h12": "12-hour (AM/PM)",
+				"h24": "24-hour"
+			}
+		},
 		"stripe_onboarding": "Stripe"
 	},
 	"cart": {
@@ -173,6 +173,11 @@
 		}
 	},
 	"client_grid": {
+		"archive_title": "Archive Client",
+		"archive_warning": "Are you sure you want to archive this client?",
+		"bulk": {
+			"merge_clients": "Merge clients"
+		},
 		"bulk_update": "Bulk Update",
 		"dialog": {
 			"add_client": "Add a client",
@@ -211,6 +216,7 @@
 			"email_address": "Email",
 			"first_name": "First Name",
 			"gate_access_numbers": "Gate Access Number",
+			"is_archived": "Archived",
 			"last_name": "Last Name",
 			"name": "Name",
 			"note": "Client Note",
@@ -228,7 +234,10 @@
 			"years_registered": "# Years Registered"
 		},
 		"hide_archived": "Hide Archived",
+		"is_archived": "Archived",
 		"show_archived": "Show Archived",
+		"unarchive_title": "Unarchive Client",
+		"unarchive_warning": "Are you sure you want to unarchive this client?",
 		"unit_slide_out": {
 			"both_sides": "Both Sides",
 			"driver_side": "Driver Side",
@@ -264,8 +273,41 @@
 		"uploaded_file": "Uploaded Insurance File"
 	},
 	"client_merge": {
+		"additional_occupants": "Additional Occupants",
+		"after": "After",
+		"apply_smart_merge": "Apply Smart Merge",
+		"auto_selected_info": "Selections are already suggested for you. Click any green card to review what is currently selected.",
+		"before": "Before",
+		"cards_combined": "Saved cards from both clients",
+		"change_log": "Change Log",
+		"change_log_subtitle": "These are the changes that will be made to the final client.",
+		"combine_both": "Combine both",
+		"combine_records_info": "Records from both clients will be combined.",
+		"final_client": "Final Client",
+		"main_client": "Main Client",
+		"no_changes_detected": "No changes will be made to the final client.",
+		"no_records_found": "No related records found",
+		"no_records_found_subtitle": "There are no related records to review in this section.",
+		"preview": "Preview",
+		"preview_helper": "Review the final merged profile before confirming.",
+		"preview_merge": "Preview",
+		"ready_to_merge": "Ready to merge",
+		"recommended": "Recommended",
+		"related_records": "Related Records",
+		"saved_cards": "Saved cards",
+		"section_helper": "Select the card you want to keep. The selected card turns green.",
+		"section_subtitle": "Tap the card you want to keep for each item.",
 		"select_master": "Select Master",
+		"smart_merge": "Smart Merge",
+		"smart_merge_title": "Apply Smart Merge?",
+		"smart_merge_tooltip": "Automatically chooses the best merge using the newer client profile, keeps non-empty values, and combines shared records from both clients.",
+		"smart_merge_warning": "Smart Merge will choose the best main client using the newer client profile, fill empty values from the other client, combine shared contact information and related records, and replace your current manual choices. You can still review and edit everything afterward.",
+		"step1_helper": "Choose the client that should remain as the main profile after the merge.",
+		"subtitle": "Combine duplicate client records into one clean profile.",
 		"title": "Client Merge",
+		"upcoming_sections": "Upcoming merge sections",
+		"vehicles": "Vehicles",
+		"view_cards": "View cards",
 		"warning": {
 			"text": "You are about to merge these client records. Some changes may be irreversible and certain existing data may be permanently overwritten. Please confirm that you want to continue.\n",
 			"title": "Confirm merge"
@@ -289,7 +331,6 @@
 	},
 	"common": {
 		"app": {
-			"SKU": "SKU",
 			"abbreviations": {
 				"daily": "D",
 				"monthly": "M",
@@ -874,6 +915,7 @@
 			"skate_ramp": "Skate ramp",
 			"ski_in_ski_out": "Ski in ski out",
 			"skip": "Skip",
+			"SKU": "SKU",
 			"small": "small",
 			"smoke_alarm": "Smoke alarm",
 			"sold_by": "Sold By",
@@ -1035,12 +1077,12 @@
 			"err-0": "Error login out user!",
 			"err-1": "Problems updating user language setting!",
 			"err-2": "Unable to login.",
-			"err-204": "No data returned!",
 			"err-3": "User already exists!",
 			"err-4": "Error adding new user!",
 			"err-5": "Error updating app settings!",
 			"err-6": "Access not permitted!",
 			"err-7": "Error getting parameters!",
+			"err-204": "No data returned!",
 			"err-client-1": "No client data returned!",
 			"err-client-2": "Error saving client information!",
 			"err-client-3": "An error occurred while attempting to save the new client.",
@@ -1631,17 +1673,17 @@
 	"lot_grid": {
 		"bulk_update": "Bulk Update",
 		"colors": {
-			"#009688": "Persian Green",
 			"#00bcd4": "Robin's Egg Blue",
 			"#03a9f4": "Cerulean",
-			"#2196f3": "Dodger Blue",
 			"#3f51b5": "San Marino",
 			"#4caf50": "Fruit Salad",
+			"#8bc34a": "Sushi",
+			"#9c27b0": "Seance",
 			"#607d8b": "Lynch",
 			"#673ab7": "Purple Heart",
+			"#2196f3": "Dodger Blue",
+			"#009688": "Persian Green",
 			"#795548": "Roman Coffee",
-			"#8bc34a": "Sushi",
-			"#9c27b0": "Seance",
 			"#cddc39": "Pear",
 			"#e91e63": "Amaranth",
 			"#f44336": "Pomegranate",

package/dist/languages/es/translations.json

@@ -52,27 +52,6 @@
 		"billing": {
 			"billing": "Facturación"
 		},
-		"date_time_display": {
-			"date_display_format_title": "Formato de visualizacion de fecha",
-			"date_display_format_label": "Formato de visualizacion de fecha",
-			"time_display_format_title": "Formato de visualizacion de hora",
-			"time_display_format_label": "Formato de visualizacion de hora",
-			"preview_label": "Vista previa",
-			"date_display_format_description": "Aplica formato solo de visualizacion en fechas de reservas, calendarios e informes sin cambiar los valores almacenados.",
-			"time_display_format_description": "Controla como se muestra la hora en toda la aplicacion. El formato predeterminado es de 24 horas.",
-			"date_formats": {
-				"iso": "ISO (2026-03-24)",
-				"us": "EE. UU. (03/24/2026)",
-				"eu": "UE (24/03/2026)",
-				"long": "Largo (24 mar 2026)",
-				"long_with_weekday": "Largo con dia (martes, 24 mar 2026)",
-				"short": "Corto (24 mar)"
-			},
-			"time_formats": {
-				"h24": "24 horas",
-				"h12": "12 horas (AM/PM)"
-			}
-		},
 		"booking_cutoff": {
 			"cutoff_day": "Permitir después de la medianoche - ¿Deberían los huéspedes poder reservar para hoy incluso después de la medianoche?",
 			"description": "Elige la hora a la que los huéspedes ya no pueden reservar hoy.\nExtienda esto después de la medianoche (por ejemplo, 2:00 a.m.) para llegadas nocturnas.",
@@ -107,8 +86,8 @@
 			"client_side_parameters_allow_online_payments": "Permite que las reservas online realicen pagos desde la cuenta del cliente en línea.",
 			"client_side_parameters_google_measurement_id": "ID de medición de Google",
 			"client_side_parameters_google_measurement_info": "El ID de medición de Google Analytics, un identificador único asignado a su página de reserva, facilita la recopilación de datos cruciales sobre las actividades de sus clientes. Estos datos son invaluables para optimizar su experiencia de reserva en línea, obtener información sobre el comportamiento del cliente y comprender diversos aspectos, como los abandonos del carrito.",
-			"client_side_parameters_parallax_image_help": "Sube una imagen para usarla como fondo de tu portal de reservas en línea.",
 			"client_side_parameters_is_length_filter_enabled": "Habilita o deshabilita el filtro de longitud del equipo en la página de reserva del lado del cliente.",
+			"client_side_parameters_parallax_image_help": "Sube una imagen para usarla como fondo de tu portal de reservas en línea.",
 			"client_side_parameters_reservation_deposit": "Depósito de reserva en línea %",
 			"client_side_parameters_reservation_deposit_description": "Este es el porcentaje de depósito que se cobrará por una reserva en línea. Puede ser entre 0 y 100 por ciento del total de la reserva.",
 			"mute_notifications": "Si está silenciado, no se reproducirá ningún sonido cuando se reciban nuevas notificaciones.",
@@ -134,6 +113,27 @@
 		"connected_account": {
 			"not_enabled_message": "Su cuenta no está configurada correctamente con cuentas conectadas a Stripe/Online. Para habilitar esta función, configure su cuenta."
 		},
+		"date_time_display": {
+			"date_display_format_description": "Aplica formato solo de visualizacion en fechas de reservas, calendarios e informes sin cambiar los valores almacenados.",
+			"date_display_format_label": "Formato de visualizacion de fecha",
+			"date_display_format_title": "Formato de visualizacion de fecha",
+			"date_formats": {
+				"eu": "UE (24/03/2026)",
+				"iso": "ISO (2026-03-24)",
+				"long": "Largo (24 mar 2026)",
+				"long_with_weekday": "Largo con dia (martes, 24 mar 2026)",
+				"short": "Corto (24 mar)",
+				"us": "EE. UU. (03/24/2026)"
+			},
+			"preview_label": "Vista previa",
+			"time_display_format_description": "Controla como se muestra la hora en toda la aplicacion. El formato predeterminado es de 24 horas.",
+			"time_display_format_label": "Formato de visualizacion de hora",
+			"time_display_format_title": "Formato de visualizacion de hora",
+			"time_formats": {
+				"h12": "12 horas (AM/PM)",
+				"h24": "24 horas"
+			}
+		},
 		"stripe_onboarding": "Raya"
 	},
 	"cart": {
@@ -173,6 +173,11 @@
 		}
 	},
 	"client_grid": {
+		"archive_title": "Archivo Cliente",
+		"archive_warning": "¿Está seguro de que desea archivar este cliente?",
+		"bulk": {
+			"merge_clients": "Fusionar clientes"
+		},
 		"bulk_update": "Actualización masiva",
 		"dialog": {
 			"add_client": "agregar un cliente",
@@ -211,6 +216,7 @@
 			"email_address": "Correo electrónico",
 			"first_name": "Primer nombre",
 			"gate_access_numbers": "Número de acceso a la puerta",
+			"is_archived": "Archivado",
 			"last_name": "Apellido",
 			"name": "Nombre",
 			"note": "Nota del cliente",
@@ -228,7 +234,10 @@
 			"years_registered": "# años registrados"
 		},
 		"hide_archived": "Ocultar archivados",
+		"is_archived": "Archivado",
 		"show_archived": "Mostrar archivados",
+		"unarchive_title": "Desarchivar Cliente",
+		"unarchive_warning": "¿Está seguro de que desea desarchivar este cliente?",
 		"unit_slide_out": {
 			"both_sides": "Ambos lados",
 			"driver_side": "El lado del conductor",
@@ -264,8 +273,41 @@
 		"uploaded_file": "Archivo de seguro cargado"
 	},
 	"client_merge": {
+		"additional_occupants": "Ocupantes adicionales",
+		"after": "Después",
+		"apply_smart_merge": "Aplicar combinación inteligente",
+		"auto_selected_info": "Las selecciones ya están sugeridas para ti. Haz clic en cualquier tarjeta verde para revisar lo que está seleccionado actualmente.",
+		"before": "Antes",
+		"cards_combined": "Tarjetas guardadas de ambos clientes",
+		"change_log": "Registro de Cambios",
+		"change_log_subtitle": "Estos son los cambios que se harán al cliente final.",
+		"combine_both": "Combinar ambos",
+		"combine_records_info": "Los registros de ambos clientes se combinarán.",
+		"final_client": "Cliente final",
+		"main_client": "Cliente principal",
+		"no_changes_detected": "No se harán cambios al cliente final.",
+		"no_records_found": "No se encontraron registros relacionados",
+		"no_records_found_subtitle": "No hay registros relacionados para revisar en esta sección.",
+		"preview": "Vista previa",
+		"preview_helper": "Revise el perfil final combinado antes de confirmar.",
+		"preview_merge": "Vista previa",
+		"ready_to_merge": "Listo para fusionar",
+		"recommended": "Recomendado",
+		"related_records": "Registros relacionados",
+		"saved_cards": "Tarjetas guardadas",
+		"section_helper": "Selecciona la tarjeta que quieres conservar. La tarjeta seleccionada se vuelve verde.",
+		"section_subtitle": "Toque la tarjeta que desea conservar para cada artículo.",
 		"select_master": "Seleccionar maestro",
+		"smart_merge": "Fusión Inteligente",
+		"smart_merge_title": "¿Aplicar fusión inteligente?",
+		"smart_merge_tooltip": "Elige automáticamente la mejor combinación usando el perfil del cliente más reciente, mantiene los valores no vacíos y combina los registros compartidos de ambos clientes.",
+		"smart_merge_warning": "Smart Merge elegirá el mejor cliente principal utilizando el perfil de cliente más reciente, completará los valores vacíos del otro cliente, combinará la información de contacto compartida y los registros relacionados, y reemplazará tus elecciones manuales actuales. Aún puedes revisar y editar todo después.",
+		"step1_helper": "Elija el cliente que debe permanecer como el perfil principal después de la fusión.",
+		"subtitle": "Combinar registros duplicados de clientes en un solo perfil limpio.",
 		"title": "Fusión de clientes",
+		"upcoming_sections": "Próximas secciones de fusión",
+		"vehicles": "Vehículos",
+		"view_cards": "Ver tarjetas",
 		"warning": {
 			"text": "Está a punto de fusionar estos registros de clientes. Algunos cambios pueden ser irreversibles y ciertos datos existentes pueden ser sobrescritos de forma permanente. Por favor, confirme que desea continuar.\n",
 			"title": "Confirmar fusión"
@@ -289,7 +331,6 @@
 	},
 	"common": {
 		"app": {
-			"SKU": "SKU",
 			"abbreviations": {
 				"daily": "D",
 				"monthly": "METRO",
@@ -874,6 +915,7 @@
 			"skate_ramp": "Rampa de skate",
 			"ski_in_ski_out": "Esquí de entrada y salida de esquí",
 			"skip": "Saltarse",
+			"SKU": "SKU",
 			"small": "pequeña",
 			"smoke_alarm": "Alarma de humo",
 			"sold_by": "Vendido por",
@@ -1035,12 +1077,12 @@
 			"err-0": "¡Error al cerrar la sesión del usuario!",
 			"err-1": "¡Problemas al actualizar la configuración de idioma del usuario!",
 			"err-2": "Incapaz de iniciar sesión.",
-			"err-204": "¡No hay datos devueltos!",
 			"err-3": "¡El usuario ya existe!",
 			"err-4": "¡Error al agregar nuevo usuario!",
 			"err-5": "¡Error al actualizar la configuración de la aplicación!",
 			"err-6": "¡Acceso no permitido!",
 			"err-7": "¡Error al obtener los parámetros!",
+			"err-204": "¡No hay datos devueltos!",
 			"err-client-1": "¡No se devolvieron datos de clientes!",
 			"err-client-2": "¡Error al guardar la información del cliente!",
 			"err-client-3": "Ocurrió un error al intentar guardar el nuevo cliente.",
@@ -1631,17 +1673,17 @@
 	"lot_grid": {
 		"bulk_update": "Actualización masiva",
 		"colors": {
-			"#009688": "Verde persa",
 			"#00bcd4": "azul huevo de petirrojo",
 			"#03a9f4": "Azul claro",
-			"#2196f3": "Dodger azul",
 			"#3f51b5": "San Marino",
 			"#4caf50": "Ensalada de frutas",
+			"#8bc34a": "Sushi",
+			"#9c27b0": "Sesión",
 			"#607d8b": "Linchar",
 			"#673ab7": "Corazón Purpura",
+			"#2196f3": "Dodger azul",
+			"#009688": "Verde persa",
 			"#795548": "Café Romano",
-			"#8bc34a": "Sushi",
-			"#9c27b0": "Sesión",
 			"#cddc39": "Pera",
 			"#e91e63": "Amaranto",
 			"#f44336": "Granada",

package/dist/languages/fr/translations.json

@@ -52,27 +52,6 @@
 		"billing": {
 			"billing": "Facturation"
 		},
-		"date_time_display": {
-			"date_display_format_title": "Format d'affichage de la date",
-			"date_display_format_label": "Format d'affichage de la date",
-			"time_display_format_title": "Format d'affichage de l'heure",
-			"time_display_format_label": "Format d'affichage de l'heure",
-			"preview_label": "Apercu",
-			"date_display_format_description": "Applique un format d'affichage uniquement aux dates des reservations, calendriers et rapports sans modifier les valeurs stockees.",
-			"time_display_format_description": "Controle la facon dont l'heure apparait dans toute l'application. Le format par defaut est 24 heures.",
-			"date_formats": {
-				"iso": "ISO (2026-03-24)",
-				"us": "US (03/24/2026)",
-				"eu": "UE (24/03/2026)",
-				"long": "Long (24 mars 2026)",
-				"long_with_weekday": "Long avec jour (mardi, 24 mars 2026)",
-				"short": "Court (24 mars)"
-			},
-			"time_formats": {
-				"h24": "24 heures",
-				"h12": "12 heures (AM/PM)"
-			}
-		},
 		"booking_cutoff": {
 			"cutoff_day": "Autoriser après minuit - Les clients devraient-ils toujours être en mesure de réserver pour aujourd’hui même après minuit ?",
 			"description": "Choisissez l’heure à laquelle les clients ne peuvent plus réserver pour aujourd’hui.\nProlongez cette période au-delà de minuit (p. ex., 2:00 du matin) pour les arrivées tard dans la nuit.",
@@ -107,8 +86,8 @@
 			"client_side_parameters_allow_online_payments": "Permet aux réservations en ligne de payer en ligne depuis le compte client en ligne.",
 			"client_side_parameters_google_measurement_id": "Identifiant de mesure Google",
 			"client_side_parameters_google_measurement_info": "L'ID de mesure Google Analytics, un identifiant unique attribué à votre page de réservation, facilite la collecte de données cruciales sur les activités de vos clients. Ces données sont inestimables pour optimiser votre expérience de réservation en ligne, obtenir des informations sur le comportement des clients et comprendre divers aspects tels que les abandons de panier.",
-			"client_side_parameters_parallax_image_help": "Televersez une image qui servira de fond pour votre portail de réservation en ligne.",
 			"client_side_parameters_is_length_filter_enabled": "Active ou désactive le filtre de longueur de l'équipement sur la page de réservation côté client.",
+			"client_side_parameters_parallax_image_help": "Televersez une image qui servira de fond pour votre portail de réservation en ligne.",
 			"client_side_parameters_reservation_deposit": "Dépôt de la réservation en ligne %",
 			"client_side_parameters_reservation_deposit_description": "Il s'agit du pourcentage d'acompte qui sera facturé pour une réservation en ligne. Peut être entre 0 et 100 % du total de la réservation.",
 			"mute_notifications": "Si le son est désactivé, aucun son sera joué lorsque de nouvelles notifications reçues.",
@@ -134,6 +113,27 @@
 		"connected_account": {
 			"not_enabled_message": "Votre compte n'est pas correctement configuré avec les comptes connectés à Stripe En ligne. Pour activer cette fonctionnalité, veuillez configurer votre compte."
 		},
+		"date_time_display": {
+			"date_display_format_description": "Applique un format d'affichage uniquement aux dates des reservations, calendriers et rapports sans modifier les valeurs stockees.",
+			"date_display_format_label": "Format d'affichage de la date",
+			"date_display_format_title": "Format d'affichage de la date",
+			"date_formats": {
+				"eu": "UE (24/03/2026)",
+				"iso": "ISO (2026-03-24)",
+				"long": "Long (24 mars 2026)",
+				"long_with_weekday": "Long avec jour (mardi, 24 mars 2026)",
+				"short": "Court (24 mars)",
+				"us": "US (03/24/2026)"
+			},
+			"preview_label": "Apercu",
+			"time_display_format_description": "Controle la facon dont l'heure apparait dans toute l'application. Le format par defaut est 24 heures.",
+			"time_display_format_label": "Format d'affichage de l'heure",
+			"time_display_format_title": "Format d'affichage de l'heure",
+			"time_formats": {
+				"h12": "12 heures (AM/PM)",
+				"h24": "24 heures"
+			}
+		},
 		"stripe_onboarding": "Stripe"
 	},
 	"cart": {
@@ -173,6 +173,11 @@
 		}
 	},
 	"client_grid": {
+		"archive_title": "Client d'archive",
+		"archive_warning": "Êtes-vous sûr de vouloir archiver ce client ?",
+		"bulk": {
+			"merge_clients": "Fusionner les clients"
+		},
 		"bulk_update": "Changement de masse",
 		"dialog": {
 			"add_client": "Ajouter un client",
@@ -211,6 +216,7 @@
 			"email_address": "Email",
 			"first_name": "Prénom",
 			"gate_access_numbers": "Numéro d'accès pour la porte",
+			"is_archived": "Archive",
 			"last_name": "Nom de famille",
 			"name": "Nom",
 			"note": "Remarque du client",
@@ -228,7 +234,10 @@
 			"years_registered": "# d'années enregistré"
 		},
 		"hide_archived": "Masquer les archives",
+		"is_archived": "Archivé",
 		"show_archived": "Afficher les archives",
+		"unarchive_title": "Désarchiver le client",
+		"unarchive_warning": "Êtes-vous sûr de vouloir désarchiver ce client ?",
 		"unit_slide_out": {
 			"both_sides": "Des deux côtés",
 			"driver_side": "Côté du conducteur",
@@ -264,8 +273,41 @@
 		"uploaded_file": "Fichier d'assurance téléchargé"
 	},
 	"client_merge": {
+		"additional_occupants": "Occupants supplémentaires",
+		"after": "Après",
+		"apply_smart_merge": "Appliquer la fusion intelligente",
+		"auto_selected_info": "Des sélections vous sont déjà suggérées. Cliquez sur n'importe quelle carte verte pour revoir ce qui est actuellement sélectionné.",
+		"before": "Avant",
+		"cards_combined": "Cartes enregistrées des deux clients",
+		"change_log": "Journal des modifications",
+		"change_log_subtitle": "Voici les modifications qui seront apportées au client final.",
+		"combine_both": "Combiner les deux",
+		"combine_records_info": "Les enregistrements des deux clients seront combinés.",
+		"final_client": "Client final",
+		"main_client": "Client Principal",
+		"no_changes_detected": "Aucun changement ne sera apporté au client final.",
+		"no_records_found": "Aucun enregistrement associé trouvé",
+		"no_records_found_subtitle": "Il n'y a aucun enregistrement lié à examiner dans cette section.",
+		"preview": "Aperçu",
+		"preview_helper": "Examinez le profil fusionné final avant de confirmer.",
+		"preview_merge": "Aperçu",
+		"ready_to_merge": "Prêt à fusionner",
+		"recommended": "Recommande",
+		"related_records": "Enregistrements liés",
+		"saved_cards": "Cartes enregistrées",
+		"section_helper": "Sélectionnez la carte que vous souhaitez conserver. La carte sélectionnée devient verte.",
+		"section_subtitle": "Appuyez sur la carte que vous souhaitez conserver pour chaque article.",
 		"select_master": "Sélectionner le maître",
+		"smart_merge": "Fusion intelligente",
+		"smart_merge_title": "Appliquer la fusion intelligente ?",
+		"smart_merge_tooltip": "Choisit automatiquement la meilleure fusion en utilisant le profil client le plus récent, conserve les valeurs non vides et combine les enregistrements partagés des deux clients.",
+		"smart_merge_warning": "Smart Merge choisira le meilleur client principal en utilisant le profil client le plus récent, remplira les valeurs vides à partir de l'autre client, combinera les informations de contact partagées et les enregistrements associés, et remplacera vos choix manuels actuels. Vous pouvez toujours tout revoir et modifier par la suite.",
+		"step1_helper": "Choisissez le client qui doit rester comme profil principal après la fusion.",
+		"subtitle": "Combinez les enregistrements clients en double en un seul profil propre.",
 		"title": "Fusion Client",
+		"upcoming_sections": "Sections de fusion à venir",
+		"vehicles": "Véhicules",
+		"view_cards": "Voir les cartes",
 		"warning": {
 			"text": "Vous êtes sur le point de fusionner ces dossiers clients. Certaines modifications peuvent être irréversibles et certaines données existantes peuvent être définitivement écrasées. Veuillez confirmer que vous souhaitez continuer.\n",
 			"title": "Confirmer la fusion"
@@ -289,7 +331,6 @@
 	},
 	"common": {
 		"app": {
-			"SKU": "SKU",
 			"abbreviations": {
 				"daily": "Jou",
 				"monthly": "Moi",
@@ -874,6 +915,7 @@
 			"skate_ramp": "Rampe de patinage",
 			"ski_in_ski_out": "Ski aux pieds",
 			"skip": "Sauter",
+			"SKU": "SKU",
 			"small": "petit",
 			"smoke_alarm": "Détecteur de fumé",
 			"sold_by": "Vendu par",
@@ -1035,12 +1077,12 @@
 			"err-0": "Erreur de déconnexion d'utilisateur!",
 			"err-1": "Problèmes de mise à jour du paramètre de langue d'utilisateur!",
 			"err-2": "Connexion échoué!",
-			"err-204": "Aucune donnée retournée!",
 			"err-3": "L'utilisateur existe déjà!",
 			"err-4": "Erreur lors de l'ajout d'un nouvel utilisateur!",
 			"err-5": "Erreur lors de la mise à jour des paramètres de l'application!",
 			"err-6": "Accès non autorisé!",
 			"err-7": "Erreur lors de la récupération des paramètres!",
+			"err-204": "Aucune donnée retournée!",
 			"err-client-1": "Aucune donnée client retournée!",
 			"err-client-2": "Erreur lors de l'enregistrement des informations du client!",
 			"err-client-3": "Une erreur s'est produite lors de la creation du nouveau client.",
@@ -1631,17 +1673,17 @@
 	"lot_grid": {
 		"bulk_update": "Changement de masse",
 		"colors": {
-			"#009688": "Vert persan",
 			"#00bcd4": "Bleu d'oeuf",
 			"#03a9f4": "Azuré",
-			"#2196f3": "Dodger Bleue",
 			"#3f51b5": "Saint Marin",
 			"#4caf50": "Salade de fruit",
+			"#8bc34a": "Sushi",
+			"#9c27b0": "Seance",
 			"#607d8b": "Lyncher",
 			"#673ab7": "Cœur violet",
+			"#2196f3": "Dodger Bleue",
+			"#009688": "Vert persan",
 			"#795548": "Café romain",
-			"#8bc34a": "Sushi",
-			"#9c27b0": "Seance",
 			"#cddc39": "Poire",
 			"#e91e63": "Amaranth",
 			"#f44336": "Pomegranate",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pcm-shared-components",
-  "version": "2.1.149",
+  "version": "2.1.151",
   "private": false,
   "main": "dist/index.js",
   "babel": {