diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties
index 81b71314d..10a321d09 100644
--- a/src/main/resources/messages/messages_es.properties
+++ b/src/main/resources/messages/messages_es.properties
@@ -1,11 +1,11 @@
 welcome=Bienvenido a
 listOffers=Ver Ofertas
-foodOffers=Ofertas por plato especifico
-foodOffer=Oferta por plato especifico
-nuOffers=Ofertas por numero de comensales
-nuOffer=Oferta por numero de comensales
-speedOffers=Ofertas rapidez comiendo
-speedOffer=Oferta por comer veloz
+foodOffers=Ofertas por plato específico
+foodOffer=Oferta por plato específico
+nuOffers=Ofertas por número de comensales
+nuOffer=Oferta por número de comensales
+speedOffers=Ofertas por tiempo empleado en comer
+speedOffer=Oferta por tiempo empleado en comer
 timeOffers=Ofertas por franja horaria
 timeOffer=Oferta por franja horaria
 food=Plato
@@ -18,17 +18,17 @@ silverGoal=Meta plata
 silverDiscount=Descuento plata
 bronzeGoal=Meta bronce
 bronzeDiscount=Descuento bronce
-startDate=Fecha inicio
+startDate=Fecha de inicio
 offerBeginning=Inicio de la oferta
-endDate=Fecha fin
+endDate=Fecha de fin
 offerEnding=Fin de la oferta
 details=Detalles
-offerCode=Codigo de la oferta
+offerCode=Código de la oferta
 return=Volver
-required=Es requeridOfertas por franja horariao
+required=Es requerido
 notFound=No ha sido encontrado
 duplicate=Ya se encuentra en uso
-nonNumeric=Sólo debe contener numeros
+nonNumeric=Solo debe contener números
 duplicateFormSubmission=No se permite el envío de formularios duplicados
-typeMismatch.date=Fecha invalida
-typeMismatch.birthDate=Fecha invalida
\ No newline at end of file
+typeMismatch.date=Fecha inválida
+typeMismatch.birthDate=Fecha inválida
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp
index 796cdceeb..d48b3e296 100644
--- a/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -281,19 +281,19 @@
 	      <img src="/resources/images/Logo Cheapy.png" id="icon" />
 	    </div>
 		<div th:if="${param.error}">
-			<p class="text-danger"> Invalid username or password</p>
+			<p class="text-danger">Nombre de usuario o contraseña inválido</p>
 		</div>
 	    <!-- Login Form -->
 	    <form class='form-signin' action="/login" method='POST'>
-	      <input type="text" id="username" class="fadeIn second" name="username" placeholder="username" required autofocus>
-	      <input type="password" id="password" class="fadeIn third" name="password" placeholder="password" required>
+	      <input type="text" id="username" class="fadeIn second" name="username" placeholder="nombre de usuario" required autofocus>
+	      <input type="password" id="password" class="fadeIn third" name="password" placeholder="contraseña" required>
 	      <sec:csrfInput />  
-		  <input type="submit" class="fadeIn fourth" value="Login">
+		  <input type="submit" class="fadeIn fourth" value="Acceder">
 	    </form>
 	
 	    <!-- Remind Passowrd -->
 	    <div id="formFooter">
-	      <a class="underlineHover" href="#">Forgot Password?</a>
+	      <a class="underlineHover" href="#">¿Olvidó su contraseña?</a>
 	    </div>
 	
 	  </div>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp
index daeeec363..e808c1d9b 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp
@@ -8,15 +8,15 @@
 
 <petclinic:layout pageName="foodOffers">
     <h2>
-        <c:if test="${foodOffer['new']}">New </c:if> FoodOffer
+        <c:if test="${foodOffer['new']}">Nueva </c:if> Oferta de plato específico
     </h2>
     <form:form modelAttribute="foodOffer" class="form-horizontal" id="add-foodOffer-form">
         <div class="form-group has-feedback">
         	<form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Start Date" name="start"/>
-            <petclinic:inputField label="End Date" name="end"/>
+            <petclinic:inputField label="Fecha de inicio" placeholder="15/06/2021 14:00" name="start"/>
+            <petclinic:inputField label="Fecha de fin" placeholder="15/06/2021 16:00" name="end"/>
             <petclinic:inputField label="Food" name="food"/>
             <petclinic:inputField label="Discount" name="discount"/>
         </div>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
index 14a7519e0..9c6b92a7d 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
@@ -8,7 +8,7 @@
 <petclinic:layout pageName="foodOffer">
 
 	<jsp:body>
-        <h2> ¿Esta seguro de que quiere eliminar su oferta? </h2>
+        <h2> ¿Está seguro de que quiere eliminar su oferta? </h2>
       		
       		<form:form modelAttribute="foodOffer" class="form-horizontal">
 	            <input type="hidden" name="food" value="${food_offer.food}" />
diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp
index 904bbfffb..6291fa5c9 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp
@@ -8,18 +8,18 @@
 
 <petclinic:layout pageName="NumOffers">
     <h2>
-        <c:if test="${nuOffer['new']}">New </c:if> NuOffer
+        <c:if test="${nuOffer['new']}">Nueva </c:if> Oferta por número de comensales
     </h2>
     <form:form modelAttribute="nuOffer" class="form-horizontal" id="add-nuOffer-form">
         <div class="form-group has-feedback">
             <form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Fecha de inicio" name="start"/>
-            <petclinic:inputField label="Fecha de fin" name="end"/>
+            <petclinic:inputField label="Fecha de inicio" placeholder="15/06/2021 14:00" name="start"/>
+            <petclinic:inputField label="Fecha de fin" placeholder="15/06/2021 16:00" name="end"/>
             
             <petclinic:inputField label="Oro" name="gold"/>
-            <petclinic:inputField label="descuento de oro" name="discountGold"/>
+            <petclinic:inputField label="Descuento de oro" name="discountGold"/>
             <petclinic:inputField label="Plata" name="silver"/>
             <petclinic:inputField label="Descuento de plata" name="discountSilver"/>
             <petclinic:inputField label="Bronce" name="bronze"/>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
index 83fa94c10..23e372718 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
@@ -8,7 +8,7 @@
 <petclinic:layout pageName="nuOffer">
 
 	<jsp:body>
-        <h2> ¿Esta seguro de que quiere dar de baja su offer? </h2>
+        <h2> ¿Está seguro de que quiere dar de baja su oferta? </h2>
       		
       		 <form:form modelAttribute="nuOffer" class="form-horizontal">
 	            <input type="hidden" name="gold" value="${nu_offer.gold}" />
diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp
index f5a351168..361d7e147 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp
@@ -37,7 +37,7 @@
             <td><c:out value="${nuOffer.discountSilver}"/></td>
         </tr>
         <tr>
-            <th>Meta bronce</th>
+            <th><fmt:message key="bronzeGoal"/></th>
             <td><c:out value="${nuOffer.bronze}"/></td>
         </tr>
         <tr>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp
index 3327373db..404d46d91 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp
@@ -8,21 +8,21 @@
 
 <petclinic:layout pageName="speedOffers">
     <h2>
-        <c:if test="${speedOffer['new']}">New </c:if> SpeedOffer
+        <c:if test="${speedOffer['new']}">Nueva </c:if> Oferta por velocidad
     </h2>
     <form:form modelAttribute="speedOffer" class="form-horizontal" id="add-speedOffer-form">
         <div class="form-group has-feedback">
             <form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Start Date" name="start"/>
-            <petclinic:inputField label="End Date" name="end"/>
-            <petclinic:inputField label="Gold" name="gold"/>
-            <petclinic:inputField label="Gold Discount" name="discountGold"/>
-            <petclinic:inputField label="Silver" name="silver"/>
-            <petclinic:inputField label="Silver Discount" name="discountSilver"/>
-            <petclinic:inputField label="Bronze" name="bronze"/>
-            <petclinic:inputField label="Bronze Discount" name="discountBronze"/>
+            <petclinic:inputField label="Fecha de inicio" placeholder="15/06/2021 14:00" name="start"/>
+            <petclinic:inputField label="Fecha de fin" placeholder="15/06/2021 16:00" name="end"/>
+            <petclinic:inputField label="Oro" name="gold"/>
+            <petclinic:inputField label="Descuento oro" name="discountGold"/>
+            <petclinic:inputField label="Plata" name="silver"/>
+            <petclinic:inputField label="Descuento plata" name="discountSilver"/>
+            <petclinic:inputField label="Bronce" name="bronze"/>
+            <petclinic:inputField label="Descuento bronce" name="discountBronze"/>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
index 0e2febbf0..d29c8b953 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
@@ -8,7 +8,7 @@
 <petclinic:layout pageName="speedOffer">
 
 	<jsp:body>
-        <h2> ¿Esta seguro de que quiere dar de baja su offer? </h2>
+        <h2> ¿Está seguro de que quiere dar de baja su oferta? </h2>
       		
       		 <form:form modelAttribute="speedOffer" class="form-horizontal">
 	            <input type="hidden" name="gold" value="${nu_offer.gold}" />
diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp
index cd12ad6fc..7afef4905 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp
@@ -8,15 +8,15 @@
 
 <petclinic:layout pageName="TimeOffers">
     <h2>
-        <c:if test="${timeOffer['new']}">New </c:if> TimeOffer
+        <c:if test="${timeOffer['new']}">Nueva </c:if> Oferta por tiempo
     </h2>
     <form:form modelAttribute="timeOffer" class="form-horizontal" id="add-timeOffer-form">
         <div class="form-group has-feedback">
         	<form:hidden path="id"/>
             <form:hidden path="code"/>
             <form:hidden path="status"/>
-            <petclinic:inputField label="Fecha de inicio" name="start"/>
-            <petclinic:inputField label="Fecha de fin" name="end"/>
+            <petclinic:inputField label="Fecha de inicio" placeholder="15/06/2021 14:00" name="start"/>
+            <petclinic:inputField label="Fecha de fin" placeholder="15/06/2021 16:00" name="end"/>
             
             <petclinic:inputField label="Hora de inicio" name="init"/>
             <petclinic:inputField label="Hora de final" name="finish"/>
@@ -28,10 +28,10 @@
             <div class="col-sm-offset-2 col-sm-10">
                 <c:choose>
                     <c:when test="${timeOffer['new']}">
-                        <button class="btn btn-default" type="submit">Add Offer</button>
+                        <button class="btn btn-default" type="submit">Añadir oferta</button>
                     </c:when>
                     <c:otherwise>
-                        <button class="btn btn-default" type="submit">Update Offer</button>
+                        <button class="btn btn-default" type="submit">Actualizar oferta</button>
                     </c:otherwise>
                 </c:choose>
             </div>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
index 0baaaabcc..7b970906b 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
@@ -8,7 +8,7 @@
 <petclinic:layout pageName="foodOffer">
 
 	<jsp:body>
-        <h2> ¿Esta seguro de que quiere eliminar su oferta? </h2>
+        <h2> ¿Está seguro de que quiere eliminar su oferta? </h2>
       		
       		<form:form modelAttribute="foodOffer" class="form-horizontal">
 	            <input type="hidden" name="init" value="${time_offer.init}" />