pcm-shared-components 2.1.132 → 2.1.136

package/dist/languages/en/translations.json

@@ -238,6 +238,14 @@
 		"upload_tooltip": "Upload a PDF file or an image of the insurance paper.",
 		"uploaded_file": "Uploaded Insurance File"
 	},
+	"client_merge": {
+		"select_master": "Select Master",
+		"title": "Client Merge",
+		"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"
+		}
+	},
 	"client_panel": {
 		"dialog": {
 			"add_gate_number_tooltip": "Add an existing gate access number.",
@@ -256,7 +264,6 @@
 	},
 	"common": {
 		"app": {
-			"SKU": "SKU",
 			"abbreviations": {
 				"daily": "D",
 				"monthly": "M",
@@ -391,6 +398,7 @@
 			"coffee_maker": "Coffee maker",
 			"column_selection": "Columns Selections",
 			"conditioner": "Conditioner",
+			"confirm": "Confirm",
 			"connected": "Connected",
 			"connecting": "Connecting",
 			"consumption": "Consumption",
@@ -838,6 +846,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",
@@ -886,6 +895,7 @@
 			"type": "Type",
 			"unavailable": "Unavailable",
 			"undo": "Undo",
+			"unit_info": "Unit Information",
 			"unit_length_lot_depth_zero_warning": "The unit length option won't appear because the lot depth is set to zero.",
 			"unit_of_measure": "Unit of Measure",
 			"unmute": "Unmute",
@@ -998,12 +1008,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.",
@@ -1588,17 +1598,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

@@ -238,6 +238,14 @@
 		"upload_tooltip": "Sube un archivo PDF o una imagen del papel del seguro.",
 		"uploaded_file": "Archivo de seguro cargado"
 	},
+	"client_merge": {
+		"select_master": "Seleccionar maestro",
+		"title": "Fusión de clientes",
+		"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"
+		}
+	},
 	"client_panel": {
 		"dialog": {
 			"add_gate_number_tooltip": "Agregue un número de acceso de puerta existente.",
@@ -256,7 +264,6 @@
 	},
 	"common": {
 		"app": {
-			"SKU": "SKU",
 			"abbreviations": {
 				"daily": "D",
 				"monthly": "METRO",
@@ -391,6 +398,7 @@
 			"coffee_maker": "Cafetera",
 			"column_selection": "Selecciones de columnas",
 			"conditioner": "Acondicionador",
+			"confirm": "Confirmar",
 			"connected": "Conectado",
 			"connecting": "Conectando",
 			"consumption": "Consumo",
@@ -838,6 +846,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",
@@ -886,6 +895,7 @@
 			"type": "Escribe",
 			"unavailable": "Indisponible",
 			"undo": "Deshacer",
+			"unit_info": "Información de la unidad",
 			"unit_length_lot_depth_zero_warning": "La opción de longitud de la unidad no aparecerá porque la profundidad del lote está establecida en cero.",
 			"unit_of_measure": "Unidad de medida",
 			"unmute": "No silenciar",
@@ -998,12 +1008,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.",
@@ -1588,17 +1598,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

@@ -238,6 +238,14 @@
 		"upload_tooltip": "Téléchargez un fichier PDF ou une image du document d'assurance.",
 		"uploaded_file": "Fichier d'assurance téléchargé"
 	},
+	"client_merge": {
+		"select_master": "Sélectionner le maître",
+		"title": "Fusion Client",
+		"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"
+		}
+	},
 	"client_panel": {
 		"dialog": {
 			"add_gate_number_tooltip": "Ajoutez un numéro d'accès existant.",
@@ -256,7 +264,6 @@
 	},
 	"common": {
 		"app": {
-			"SKU": "SKU",
 			"abbreviations": {
 				"daily": "Jou",
 				"monthly": "Moi",
@@ -391,6 +398,7 @@
 			"coffee_maker": "Machine à café",
 			"column_selection": "Sélections de colonnes",
 			"conditioner": "Conditionneur",
+			"confirm": "Confirmer",
 			"connected": "Connecté",
 			"connecting": "Connection en cours",
 			"consumption": "Consommation",
@@ -838,6 +846,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",
@@ -886,6 +895,7 @@
 			"type": "Type",
 			"unavailable": "Indisponible",
 			"undo": "Annuler",
+			"unit_info": "Informations sur l'unité",
 			"unit_length_lot_depth_zero_warning": "L'option de longueur n'apparaîtra pas car la profondeur du lot est zéro.",
 			"unit_of_measure": "Unité de mesure",
 			"unmute": "Activer le son",
@@ -998,12 +1008,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.",
@@ -1588,17 +1598,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.132",
+  "version": "2.1.136",
   "private": false,
   "main": "dist/index.js",
   "babel": {
@@ -14,7 +14,6 @@
   "scripts": {
     "publishme": "npm publish",
     "bump": "git pull --tags && npm run build && node scripts/smart-bump.js && dotenv -- npm publish",
-    "bump-orig": "git pull --tags && npm run build && node scripts/smart-bump.js && git push origin HEAD && git push origin v$(node -p \"require('./package.json').version\") && source .env && npm publish",
     "start": "start-storybook -p 6006",
     "build-storybook": "build-storybook",
     "clean": "rm -rf dist",