diff --git a/pom.xml b/pom.xml
index 3702bb011..18c36f9af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-<<<<<<< HEAD
-	<version>1.117.3</version>
-=======
 	<version>1.118.0</version>
->>>>>>> master
 	<packaging>war</packaging> 
     
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java
index 47843e0a0..2d9c56b32 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java
@@ -109,7 +109,7 @@ public class CotizarExpresoController extends MyGenericForwardComposer{
 		
 		txtNumSolicitud.setValue(expreso.getSolicitudExpresoId().toString());
 		txtRuta.setValue(expreso.getCiudadOrigen().getNombciudad() + " - " + expreso.getCiudadDestino().getNombciudad());
-		txtIdaRegreso.setValue(expreso.getIndViajeRedondo() == true ? "Ida y Regreso" : "Ida");
+		txtIdaRegreso.setValue(expreso.getIndViajeRedondo() == true ? Labels.getLabel("expresosController.lbl.idaVuelta") : Labels.getLabel("expresosController.lbl.ida"));
 		txtCantPasajeros.setValue(expreso.getCantidadPasajeros().toString());
 		txtFechaIda.setValue(expreso.getFechaHoraIda().toString());
 		txtFechaRegreso.setValue(expreso.getFechaHoraRegreso().toString());
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java
index 0b1181ba6..0b44df3a2 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java
@@ -63,13 +63,13 @@ public class RenderCargaContratoExpresos implements ListitemRenderer{
         lc.setParent(item);
         
         if(expresos.getIndViajeRedondo() == false) {
-        	lc = new Listcell("Ida");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.ida"));
             lc.setParent(item);
         }else if (expresos.getIndViajeRedondo() == true) {
-        	lc = new Listcell("Ida y Regreso");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.idaVuelta"));
             lc.setParent(item);
         }else {
-        	lc = new Listcell("N/A");
+        	lc = new Listcell();
             lc.setParent(item);
         }
         
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java
index c1dc2abaa..54f2158e6 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java
@@ -50,13 +50,13 @@ public class RenderDocumentosExpresos implements ListitemRenderer {
         lc.setParent(item);
         
         if(expresos.getIndViajeRedondo() == false) {
-        	lc = new Listcell("Ida");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.ida"));
             lc.setParent(item);
         }else if (expresos.getIndViajeRedondo() == true) {
-        	lc = new Listcell("Ida y Regreso");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.idaVuelta"));
             lc.setParent(item);
         }else {
-        	lc = new Listcell("N/A");
+        	lc = new Listcell();
             lc.setParent(item);
         }
         
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java
index 59f468e9e..586ce5437 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java
@@ -60,10 +60,10 @@ public class RenderExpresosPorCotizar implements ListitemRenderer {
         lc.setParent(item);
         
         if(expresos.getIndViajeRedondo() == false) {
-        	lc = new Listcell("Ida");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.idaVuelta"));
             lc.setParent(item);
         }else if (expresos.getIndViajeRedondo() == true) {
-        	lc = new Listcell("Ida y Regreso");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.idaVuelta"));
             lc.setParent(item);
         }else {
         	lc = new Listcell("N/A");
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java
index a40724c2f..acbec9b0b 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java
@@ -57,13 +57,13 @@ public class RenderProgramacionVehiculosExpresos implements ListitemRenderer {
         lc.setParent(item);
         
         if(expresos.getIndViajeRedondo() == false) {
-        	lc = new Listcell("Ida");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.ida"));
             lc.setParent(item);
         }else if (expresos.getIndViajeRedondo() == true) {
-        	lc = new Listcell("Ida y Regreso");
+        	lc = new Listcell(Labels.getLabel("expresosController.lbl.idaVuelta"));
             lc.setParent(item);
         }else {
-        	lc = new Listcell("N/A");
+        	lc = new Listcell();
             lc.setParent(item);
         }
         
diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label
index 75eac1a82..02aa6af7d 100644
--- a/web/WEB-INF/i3-label_en.label
+++ b/web/WEB-INF/i3-label_en.label
@@ -7524,7 +7524,6 @@ indexController.mnAjuda.label = Help
 indexController.mnCatalogos.label = Catalogs
 indexController.mnConfiguracionesComerciales.label = Commercial Configuration
 #PARTE REALIZADA POR MANUEL
-<<<<<<< HEAD
 indexController.mnCortesias.label = Cortesias Para Funcionários
 indexController.mnEquivalencia.label = Equivalencia
 indexController.mnEsquemaOperacional.label = Esquema Operacional
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 628e6477d..c06bff600 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -7457,6 +7457,8 @@ indexController.mniExpressosDocumentos.label = Documentos
 expresosController.lbl.verDetalle = Ver Detalle
 expresosController.lbl.asignarBus = Asignar Bus
 expresosController.lbl.pagadoCredito = Pagado a Crédito
+expresosController.lbl.idaVuelta = Ida y Regreso
+expresosController.lbl.idaVuelta = Ida
 
 expresoController.MSG.errorArchivo = Archivo inválidoo o nulo
 cargaContratoController.MSG.errorExpresoNull = Seleccione Expreso a Asociar Contrato