diff --git a/src/main/java/com/uniovi/configuration/CustomConfiguration.java b/src/main/java/com/uniovi/configuration/CustomConfiguration.java
index f0a5bf95..2feb1946 100644
--- a/src/main/java/com/uniovi/configuration/CustomConfiguration.java
+++ b/src/main/java/com/uniovi/configuration/CustomConfiguration.java
@@ -2,10 +2,31 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.web.servlet.LocaleResolver;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
-@Configuration
-public class CustomConfiguration {
+import java.util.Locale;
 
+@Configuration
+public class CustomConfiguration implements WebMvcConfigurer {
+    @Bean
+    public LocaleResolver localeResolver() {
+        SessionLocaleResolver localeResolver = new SessionLocaleResolver();
+        localeResolver.setDefaultLocale(new Locale("es", "ES"));
+        return localeResolver;
+    }
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor localeChangeInterceptor =
+                new LocaleChangeInterceptor();
+        localeChangeInterceptor.setParamName("lang");
+        return localeChangeInterceptor;
+    }
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(localeChangeInterceptor());
+    }
 }
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
new file mode 100644
index 00000000..fbf68e22
--- /dev/null
+++ b/src/main/resources/messages.properties
@@ -0,0 +1,60 @@
+# Idioma por defecto español
+# -------------------Statements for the nav.html file----------------------
+navbar.home=Inicio
+navbar.play=Jugar
+navbar.game1=Juego 1
+navbar.game2=Juego 2
+navbar.history=Historial
+navbar.changeLanguage=Idioma
+navbar.toEnglish=Inglés
+navbar.toSpanish=Español
+
+# Buttons for non-authenticated users
+navbar.signup=Regístrate
+navbar.login=Inicia sesión
+
+# Buttons for authenticated users
+navbar.profile=Perfil
+navbar.logout=Cerrar sesión
+
+# -------------------Statements for the footer.html file---------------------
+footer.copyright=ASW - Grupo 04 B
+
+
+# -------------------Statements for the error.html file---------------------
+error.page.title=Error!
+error.status=Estado:
+error.message=Mensaje de error:
+error.error=Error:
+
+# -------------------Statements for the index.html file---------------------
+index.heading=Bienvenidos a la página principal
+index.development=En desarrollo
+
+# -------------------Statements for the home.html file---------------------
+home.heading=Bienvenido
+home.private_zone=Esta es una zona privada de la web
+home.authenticated_as=Usuario autenticado como:
+
+
+# -------------------Statements for the login.html file---------------------
+login.username.label=Usuario:
+login.username.placeholder=Ejemplo: wikiuser
+login.password.label=Contraseña:
+login.password.placeholder=Password_Ejemplo
+login.sumbit=Iniciar sesión
+login.error=Error:
+login.title=Identifícate
+
+# -------------------Statements for the signup.html file---------------------
+signup.username.label=Nombre de usuario:
+signup.username.placeholder=wikiuser
+signup.email.label=Correo electrónico:
+signup.email.placeholder=test@test.com
+signup.password.label=Contraseña:
+signup.password.placeholder=Introduzca la contraseña
+signup.passwordConfirm.label=Repita la contraseña:
+signup.passwordConfirm.placeholder=Repita la contraseña
+signup.submit=Registrarse
+signup.title=Regístrate
+
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
new file mode 100644
index 00000000..69a1f387
--- /dev/null
+++ b/src/main/resources/messages_en.properties
@@ -0,0 +1,61 @@
+# Idioma inglés
+# Navbar
+navbar.home=Home
+navbar.play=Play
+navbar.game1=Game 1
+navbar.game2=Game 2
+navbar.history=History
+navbar.changeLanguage=Idiom
+navbar.toEnglish=English
+navbar.toSpanish=Spanish
+
+# Buttons for non-authenticated users
+navbar.signup=Sign Up
+navbar.login=Log In
+
+# Buttons for authenticated users
+navbar.profile=Profile
+navbar.logout=Log Out
+
+# -------------------Statements for the footer.html file---------------------
+footer.copyright=ASW - Group 04 B
+
+# -------------------Statements for the error.html file---------------------
+error.page.title=Error!
+error.status=Status:
+error.message=Error message:
+error.error=Error:
+
+# -------------------Statements for the index.html file---------------------
+index.heading=Welcome to the main page
+index.development=Under development
+
+# -------------------Statements for the home.html file---------------------
+home.heading=Welcome
+home.private_zone=This is a private zone of the website
+home.authenticated_as=Authenticated User as:
+
+# -------------------Statements for the login.html file---------------------
+login.username.label=Username:
+login.username.placeholder=Example: wikiuser
+login.password.label=Password:
+login.password.placeholder=Password_Example
+login.sumbit=Log in
+login.error=Error:
+login.title=Log in
+
+# -------------------Statements for the signup.html file---------------------
+signup.username.label=Username:
+signup.username.placeholder=wikiuser
+signup.email.label=Email:
+signup.email.placeholder=test@test.com
+signup.password.label=Password:
+signup.password.placeholder=Enter your password
+signup.passwordConfirm.label=Confirm Password:
+signup.passwordConfirm.placeholder=Confirm your password
+signup.submit=Sign up
+signup.title=Sign up
+
+
+
+
diff --git a/src/main/resources/messages_es.properties b/src/main/resources/messages_es.properties
new file mode 100644
index 00000000..ca856285
--- /dev/null
+++ b/src/main/resources/messages_es.properties
@@ -0,0 +1,60 @@
+# Idioma español
+# -------------------Statements for the nav.html file----------------------
+navbar.home=Inicio
+navbar.play=Jugar
+navbar.game1=Juego 1
+navbar.game2=Juego 2
+navbar.history=Historial
+navbar.changeLanguage=Idioma
+navbar.toEnglish=Inglés
+navbar.toSpanish=Español
+
+# Buttons for non-authenticated users
+navbar.signup=Regístrate
+navbar.login=Inicia sesión
+
+# Buttons for authenticated users
+navbar.profile=Perfil
+navbar.logout=Cerrar sesión
+
+
+# -------------------Statements for the footer.html file---------------------
+footer.copyright=ASW - Grupo 04 B
+
+# -------------------Statements for the error.html file---------------------
+error.page.title=Error!
+error.status=Estado:
+error.message=Mensaje de error:
+error.error=Error:
+
+# -------------------Statements for the index.html file---------------------
+index.heading=Bienvenidos a la página principal
+index.development=En desarrollo
+
+# -------------------Statements for the home.html file---------------------
+home.heading=Bienvenido
+home.private_zone=Esta es una zona privada de la web
+home.authenticated_as=Usuario autenticado como:
+
+# -------------------Statements for the login.html file---------------------
+login.username.label=Usuario:
+login.username.placeholder=Ejemplo: wikiuser
+login.password.label=Contraseña:
+login.password.placeholder=Password_Ejemplo
+login.sumbit=Iniciar sesión
+login.error=Error:
+login.title=Identifícate
+
+# -------------------Statements for the signup.html file---------------------
+signup.username.label=Nombre de usuario:
+signup.username.placeholder=wikiuser
+signup.email.label=Correo electrónico:
+signup.email.placeholder=test@test.com
+signup.password.label=Contraseña:
+signup.password.placeholder=Introduzca la contraseña
+signup.passwordConfirm.label=Repita la contraseña:
+signup.passwordConfirm.placeholder=Repita la contraseña
+signup.submit=Registrarse
+signup.title=Regístrate
+
+
diff --git a/src/main/resources/static/images/if_spain_flag.png b/src/main/resources/static/images/if_spain_flag.png
new file mode 100644
index 00000000..36b30d75
Binary files /dev/null and b/src/main/resources/static/images/if_spain_flag.png differ
diff --git a/src/main/resources/static/images/if_uk_flag.png b/src/main/resources/static/images/if_uk_flag.png
new file mode 100644
index 00000000..0291e298
Binary files /dev/null and b/src/main/resources/static/images/if_uk_flag.png differ
diff --git a/src/main/resources/static/script/languages.js b/src/main/resources/static/script/languages.js
new file mode 100644
index 00000000..f50b80d5
--- /dev/null
+++ b/src/main/resources/static/script/languages.js
@@ -0,0 +1,10 @@
+$(document).ready(function () {
+    $("#languageDropdownMenuButton a").click(function (e) {
+        e.preventDefault(); // cancel the link behaviour
+        let languageSelectedText = $(this).text();
+        let languageSelectedValue = $(this).attr("value");
+        $("#btnLanguage").text(languageSelectedText);
+        window.location.replace('?lang=' + languageSelectedValue);
+        return false;
+    });
+});
\ No newline at end of file
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index b461e3f7..846af549 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -5,15 +5,15 @@
 <nav th:replace="~{fragments/nav}"></nav>
 
 <div class="container mt-5">
-    <h2 class="text-danger">Error!</h2>
+    <h2 class="text-danger" th:text="#{error.page.title}"></h2>
     <div class="alert alert-danger" role="alert">
-        Estado: <strong th:text="${status}"></strong>
+        <span th:text="#{error.status}"></span> <strong th:text="${status}"></strong>
     </div>
     <div class="alert alert-warning" role="alert">
-        Error: <strong th:text="${error}"></strong>
+        <span th:text="#{error.error}"></span> <strong th:text="${error}"></strong>
     </div>
     <div class="alert alert-info" role="alert">
-        Mensaje de error: <strong th:text="${message}"></strong>
+        <span th:text="#{error.message}"></span> <strong th:text="${message}"></strong>
     </div>
 </div>
 
diff --git a/src/main/resources/templates/fragments/head.html b/src/main/resources/templates/fragments/head.html
index 77a558b1..e977c69e 100644
--- a/src/main/resources/templates/fragments/head.html
+++ b/src/main/resources/templates/fragments/head.html
@@ -15,4 +15,5 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
     <!-- Nuestra CSS -->
     <link rel="stylesheet" href="/css/custom.css" />
+    <script src="/script/languages.js"> </script>
 </head>
diff --git a/src/main/resources/templates/fragments/nav.html b/src/main/resources/templates/fragments/nav.html
index ea14a9c7..33b4f023 100644
--- a/src/main/resources/templates/fragments/nav.html
+++ b/src/main/resources/templates/fragments/nav.html
@@ -1,5 +1,6 @@
 <!-- nav.html -->
-<nav class="navbar navbar-expand-lg navbar-dark bg-primary" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extrasspringsecurity5">
+<nav class="navbar navbar-expand-lg navbar-dark bg-primary" xmlns:sec="http://www.thymeleaf.org/thymeleaf-extrasspringsecurity5"
+     xmlns:th="http://www.thymeleaf.org">
     <a class="navbar-brand" href="#"></a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#myNavbar"
             aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
@@ -8,17 +9,42 @@
     <div class="collapse navbar-collapse" id="my-navbarColor02">
         <ul class="navbar-nav mr-auto">
             <li class="nav-item ">
-                <a class="nav-link" href="/">Home<span class="sr-only">(current)</span></a>
+                <a class="nav-link" href="/">
+                    <i class='fas fa-user' style='font-size:16px'></i>
+                    <span th:text="#{navbar.home}"></span>
+                </a>
             </li>
             <li class="nav-item dropdown active">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown"
-                   aria-haspopup="true" aria-expanded="false"> Jugar
+                   aria-haspopup="true" aria-expanded="false">
+                    <span th:text="#{navbar.play}"></span>
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                    <a class="dropdown-item" href="/">Juego 1</a>
-                    <a class="dropdown-item" href="/">Juego 2</a>
+                    <a class="dropdown-item" href="/" th:text="#{navbar.game1}"></a>
+                    <a class="dropdown-item" href="/" th:text="#{navbar.game2}"></a>
                     <div class="dropdown-divider"></div>
-                    <a class="dropdown-item" href="/">Historial</a>
+                    <a class="dropdown-item" href="/" th:text="#{navbar.history}"></a>
+                </div>
+            </li>
+        </ul>
+        <ul class="navbar-nav justify-content-end">
+            <!-- Botones para cambiar de idioma -->
+            <li class="nav-item dropdown">
+                <a class="nav-link dropdown-toggle" href="#" id="btnLanguage" role="button" data-toggle="dropdown"
+                   aria-haspopup="true" aria-expanded="false">
+                    <span th:text="#{navbar.changeLanguage}"></span>
+                </a>
+                <div id="languageDropdownMenuButton" class="dropdown-menu" aria-labelledby="navbarDropdown">
+                    <!-- Botón para cambiar a inglés -->
+                    <a class="dropdown-item" id="btnEnglish" value="EN">
+                        <img th:src="@{/images/if_uk_flag.png}" style="border: 0; float: left; margin-right: 15px"/>
+                        <span th:text="#{navbar.toEnglish}"></span>
+                    </a>
+                    <!-- Botón para cambiar a español -->
+                    <a class="dropdown-item" id="btnSpanish" value="ES">
+                        <img th:src="@{/images/if_spain_flag.png}" style="border: 0; float: left; margin-right: 15px"/>
+                        <span th:text="#{navbar.toSpanish}"></span>
+                    </a>
                 </div>
             </li>
         </ul>
@@ -27,23 +53,28 @@
             <li class="nav-item" sec:authorize="!isAuthenticated()">
                 <a class="nav-link" href="/signup">
                     <i class='fas fa-user-alt' style='font-size:16px'></i>
-                    Registrate</a>
+                    <span th:text="#{navbar.signup}"></span>
+                </a>
             </li>
             <li class="nav-item" sec:authorize="!isAuthenticated()">
                 <a class="nav-link" href="/login">
-                <i class='fas fa-sign-in-alt' style='font-size:16px'></i>
-                Identifícate</a></li>
+                    <i class='fas fa-sign-in-alt' style='font-size:16px'></i>
+                    <span th:text="#{navbar.login}"></span>
+                </a>
+            </li>
 
             <!-- Botones para cuando el usuario ESTÁ autenticado -->
             <li class="nav-item" sec:authorize="isAuthenticated()">
                 <a class="nav-link" href="/home" sec:authentication="principal.username">
                     <i class='fas fa-user' style='font-size:16px'></i>
+                    <span th:text="#{navbar.profile}"></span>
                 </a>
             </li>
             <li class="nav-item" sec:authorize="isAuthenticated()">
                 <a class="nav-link" href="/logout">
                     <i class='fas fa-user-alt' style='font-size:16px'></i>
-                    Cerrar sesión</a>
+                    <span th:text="#{navbar.logout}"></span>
+                </a>
             </li>
         </ul>
     </div>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 659e758c..350e878b 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -4,8 +4,8 @@
 <body>
 <nav th:replace="~{fragments/nav}"></nav>
 <div class="container" style="text-align: center">
-    <h2>Bienvenidos a la página principal</h2>
-    <p>En desarrollo</p>
+    <h2 th:text="#{index.heading}" ></h2>
+    <p th:text="#{index.development}"></p>
 </div>
 <footer th:replace="~{fragments/footer}"></footer>
 </body>
diff --git a/src/main/resources/templates/player/home.html b/src/main/resources/templates/player/home.html
index 9aa6e2f4..fdc70c95 100644
--- a/src/main/resources/templates/player/home.html
+++ b/src/main/resources/templates/player/home.html
@@ -4,10 +4,10 @@
 <body>
 <nav th:replace="~{fragments/nav}"></nav>
 <div class="container" style="text-align: center">
-    <h2>Bienvenido</h2>
-    <h3>Esta es una zona privada la web</h3>
+    <h2 th:text="#{home.heading}"></h2>
+    <h3 th:text="#{home.private_zone}"></h3>
     <p>
-        Usuario Autenticado como :
+        <span th:text="#{home.authenticated_as}"></span>
         <b th:inline="text" sec:authentication="principal.username"></b>
     </p>
 </div>
diff --git a/src/main/resources/templates/player/login.html b/src/main/resources/templates/player/login.html
index e3012420..aba06d6c 100644
--- a/src/main/resources/templates/player/login.html
+++ b/src/main/resources/templates/player/login.html
@@ -4,27 +4,27 @@
 <body>
 <nav th:replace="~{fragments/nav}"/>
 <div class="container">
-  <div class="alert alert-danger" th:if="${error}" th:text="${error}" role="alert"></div>
+  <div class="alert alert-danger" th:if="${error}" th:text="#{login.error}" role="alert"></div>
 
-  <h2>Identifícate</h2>
+  <h2 th:text="#{login.title}"> </h2>
   <form class="form-horizontal" method="post" action="/login">
     <div class="form-group">
-      <label class="control-label col-sm-2" for="username">Usuario:</label>
+      <label class="control-label col-sm-2" for="username" th:text="#{login.username.label}"></label>
       <div class="col-sm-10">
         <input type="text" class="form-control" id="username" name="username"
-               placeholder="Ejemplo: wikiuser" required="true" />
+               th:placeholder="#{login.username.placeholder}" required="true" />
       </div>
     </div>
     <div class="form-group">
-      <label class="control-label col-sm-2" for="password">Contraseña:</label>
+      <label class="control-label col-sm-2" for="password" th:text="#{login.password.label}"></label>
       <div class="col-sm-10">
         <input type="password" class="form-control" id="password" name="password"
-               placeholder="Contraseña" required="true" />
+               th:placeholder="#{login.password.placeholder}" required="true" />
       </div>
     </div>
     <div class="form-group">
       <div class="col-sm-offset-2 col-sm-10">
-        <button type="submit" class="btn btn-primary">Iniciar sesión</button>
+        <button type="submit" class="btn btn-primary" th:text="#{login.sumbit}"></button>
       </div>
     </div>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" />
diff --git a/src/main/resources/templates/player/signup.html b/src/main/resources/templates/player/signup.html
index 16a09cc0..5b666e29 100644
--- a/src/main/resources/templates/player/signup.html
+++ b/src/main/resources/templates/player/signup.html
@@ -5,43 +5,43 @@
 <!-- Barra de Navegación superior -->
 <nav th:replace="~{fragments/nav}"/>
 <div class="container">
-    <h2>Registrate</h2>
+    <h2 th:text="#{signup.title}"></h2>
     <form class="form-horizontal" th:object="${user}" method="post" action="/signup">
         <div class="form-group">
-            <label class="control-label col-sm-2" for="username">Nombre de usuario:</label>
+            <label class="control-label col-sm-2" for="username" th:text="#{signup.username.label}"> </label>
             <div class="col-sm-10">
                 <input type="text" class="form-control" id="username" name="username"
-                       placeholder="wikiuser" required="true" th:value="${user.username}"/>
+                       th:placeholder="#{signup.username.placeholder}" required="true"/>
                 <span class="text-danger" th:if="${#fields.hasErrors('username')}" th:errors="*{username}"></span>
             </div>
         </div>
         <div class="form-group">
-            <label class="control-label col-sm-2" for="email">Correo electrónico:</label>
+            <label class="control-label col-sm-2" for="email" th:text="#{signup.email.label}"></label>
             <div class="col-sm-10">
                 <input type="text" class="form-control" id="email" name="email"
-                       placeholder="test@test.com" required="true" th:value="${user.email}"/>
+                       th:placeholder="#{signup.email.placeholder}" required="true" />
                 <span class="text-danger" th:if="${#fields.hasErrors('email')}" th:errors="*{email}"></span>
             </div>
         </div>
         <div class="form-group">
-            <label class="control-label col-sm-2" for="password">Contraseña:</label>
+            <label class="control-label col-sm-2" for="password" th:text="#{signup.password.label}"></label>
             <div class="col-sm-10">
                 <input type="password" id="password" class="form-control" name="password"
-                       placeholder="Introduzca la contraseña" />
+                       th:placeholder="#{signup.password.placeholder}" />
                 <span class="text-danger" th:if="${#fields.hasErrors('password')}" th:errors="*{password}"></span>
             </div>
         </div>
         <div class="form-group">
-            <label class="control-label col-sm-2" for="passwordConfirm">Repita la contraseña:</label>
+            <label class="control-label col-sm-2" for="passwordConfirm" th:text="#{signup.passwordConfirm.label}"></label>
             <div class="col-sm-10">
                 <input type="password" id="passwordConfirm" class="form-control" name="passwordConfirm"
-                       placeholder="Repita la contraseña" />
+                       th:placeholder="#{signup.passwordConfirm.placeholder}" />
                 <span class="text-danger" th:if="${#fields.hasErrors('passwordConfirm')}" th:errors="*{passwordConfirm}"></span>
             </div>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
-                <button type="submit" class="btn btn-primary">Registrarse</button>
+                <button type="submit" class="btn btn-primary" th:text="#{signup.submit}"></button>
             </div>
         </div>
         <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" />