From 7ab95cd20762d41c7aac570a99ba93e8dc5b63b2 Mon Sep 17 00:00:00 2001 From: "luis.espina" Date: Thu, 5 Sep 2024 17:08:04 -0400 Subject: [PATCH] Fixes Bug#AL4506 --- web/WEB-INF/i3-label_en.label | 1 - web/WEB-INF/i3-label_es_MX.label | 1 - web/WEB-INF/i3-label_fr_FR.label | 1 - web/WEB-INF/i3-label_pt_BR.label | 1 - 4 files changed, 4 deletions(-) diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index a1d81ee4b..b451e5254 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -3706,7 +3706,6 @@ editarConfiguracionAntecipaComController.lbRetem.value = Holds editarConfiguracionAntecipaController.btnApagar.tooltiptext = Delete editarConfiguracionAntecipaController.btnSalvar.tooltiptext = Save -<<<<<<< HEAD editarConfiguracionAntecipaController.lblData.value = Date editarConfiguracionAntecipaController.lblPercentual.value = Percentage editarConfiguracionAntecipaController.lblRetem.value = retain diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index e7e12cf84..0a5fe8d0d 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -3705,7 +3705,6 @@ editarConfiguracionAntecipaComController.lbRetem.value = Conserva editarConfiguracionAntecipaController.btnApagar.tooltiptext = Eliminar editarConfiguracionAntecipaController.btnSalvar.tooltiptext = Guardar -<<<<<<< HEAD editarConfiguracionAntecipaController.lblData.value = Fecha editarConfiguracionAntecipaController.lblPercentual.value = Porcentaje editarConfiguracionAntecipaController.lblRetem.value = Conserva diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label index 2dbe1816e..3afa2a3e8 100644 --- a/web/WEB-INF/i3-label_fr_FR.label +++ b/web/WEB-INF/i3-label_fr_FR.label @@ -3703,7 +3703,6 @@ editarConfiguracionAntecipaComController.lbRetem.value = Tient editarConfiguracionAntecipaController.btnApagar.tooltiptext = Supprimer editarConfiguracionAntecipaController.btnSalvar.tooltiptext = Enregistrer -<<<<<<< HEAD editarConfiguracionAntecipaController.lblData.value = Date editarConfiguracionAntecipaController.lblPercentual.value = Pourcentage editarConfiguracionAntecipaController.lblRetem.value = retenir diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index c6fceef3a..143553250 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -3698,7 +3698,6 @@ editarConfiguracionAntecipaComController.lbRetem.value = Retém editarConfiguracionAntecipaController.btnApagar.tooltiptext = Eliminar editarConfiguracionAntecipaController.btnSalvar.tooltiptext = Salvar -<<<<<<< HEAD editarConfiguracionAntecipaController.lblData.value = Data editarConfiguracionAntecipaController.lblPercentual.value = Percentual editarConfiguracionAntecipaController.lblRetem.value = Retem