diff --git a/README.md b/README.md
index 7c33770..c6fc5d4 100644
--- a/README.md
+++ b/README.md
@@ -290,6 +290,8 @@ Contributors
 
 	* Simon Vieille <contact@deblan.fr>
 
-**Translations**
+**Translators**
 
 	* Simon Vieille <contact@deblan.fr>
+	* Marion Sanchez
+	* Marjorie Da Silva
diff --git a/app/bootstrap.php.d/30-trans.php b/app/bootstrap.php.d/30-trans.php
index e421458..7dead3e 100644
--- a/app/bootstrap.php.d/30-trans.php
+++ b/app/bootstrap.php.d/30-trans.php
@@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Cookie;
 $app->register(new TranslationServiceProvider(), array(
     'locale' => 'en',
     'locale_fallback' => 'en',
-    'locales' => array('en', 'fr'), 
+    'locales' => array('en', 'fr', 'es', 'de'), 
 ));
 
 $app['translator'] = $app->extend('translator', function ($translator, $app) {
diff --git a/app/locales/es.yml b/app/locales/es.yml
new file mode 100644
index 0000000..bb8fe73
--- /dev/null
+++ b/app/locales/es.yml
@@ -0,0 +1,97 @@
+app:
+    title: '#!GIST'
+    title_prefix: '#!GIST - '
+
+    menu:
+        home:
+            title: 'Inicio'
+        about:
+            title: 'A propósito'
+        my:
+            login:
+                title: 'Conexión'
+            logout:
+                title: 'Desconexión'
+            register:
+                title: 'Apuntarse'
+            my:
+                title: 'Mi cuenta'
+
+my:
+    title: 'Mis Gists'
+    nothing: 'Nada por ahora.'
+
+gist:
+    untitled: 'Sin título'
+    404:
+        title: '¡Uy!'
+        message: "Este gist no existe."
+    action:
+        view: 'Visualizar'
+        history: 'Confirmacion(es)'
+        raw: 'RAW'
+        download: 'Descargar'
+        clone: 'Clonar'
+        embed: 'Insertar : '
+        add: 'Añadir'
+
+date:
+    format: 'd/m/Y H\hi s\s'
+
+footer:
+    text: '<p>Impulsado por <a href="https://gitnet.fr/deblan/gist">GIST</a>, es libre :) - <a href="https://gitnet.fr/deblan/gist#api">API</a></p>'
+
+login:
+    login:
+        title: 'Identificación'
+        invalid: 'Nombre de usuario o contraseña incorrecta'
+        form:
+            username:
+                placeholder: 'Nombre de usuario'
+            password:
+                placeholder: 'Contraseña'
+            remember_me:
+                label: 'Recordar mis datos'
+    register:
+        title: 'Nueva cuenta'
+        already_exists: 'Este nombre de usuario ya está en uso'
+        registred: '¡ Enhorabuena, su cuenta fue creada !'
+        form:
+            username:
+                placeholder: 'Nombre de usuario'
+            password:
+                placeholder: 'Contraseña'
+
+form:
+    error:
+        not_blank: 'Se necesita introducir este dato.'
+    title:
+        placeholder: 'Título'
+    cipher:
+        label: 'Cifrar : %value%'
+        choice:
+            anyway: 'Da igual'
+            yes: 'Sí'
+            no: 'No'
+    submit: 'Enviar'
+    filter: 'Filtrar'
+    success:
+        gist: 'Su Gist ha sido eliminado.'
+    type:
+        label: 'Lenguaje : %value%'
+        choice:
+            all: 'Todos'
+            html: 'HTML'
+            xml: 'XML'
+            css: 'CSS'
+            javascript: 'JAVASCRIPT'
+            php: 'PHP'
+            sql: 'SQL'
+            yaml: 'YAML'
+            perl: 'PERL'
+            c: 'C/C++'
+            asp: 'ASP'
+            python: 'PYTHON'
+            bash: 'BASH'
+            actionscript3: 'ACTION SCRIPT'
+            text: 'TEXTE'
diff --git a/src/Gist/Resources/views/base.html.twig b/src/Gist/Resources/views/base.html.twig
index 2070a5b..4ea1c1e 100644
--- a/src/Gist/Resources/views/base.html.twig
+++ b/src/Gist/Resources/views/base.html.twig
@@ -71,12 +71,11 @@
                         </ul>
                         {% block langs %}
                             <p class="navbar-text navbar-right">
-                                <a class="lang btn btn-xs cipher-link" href="{{ path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge({_locale: 'en'})) }}">
-                                    <span class="flag-icon flag-icon-gb"></span>
-                                </a>
-                                <a class="lang btn btn-xs cipher-link" href="{{ path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge({_locale: 'fr'})) }}">
-                                    <span class="flag-icon flag-icon-fr"></span>
-                                </a>
+                                {% for locale, flag in {'en': 'gb', 'fr': 'fr', 'es': 'es', 'de': 'de'} %}
+                                    <a class="lang btn btn-xs cipher-link" href="{{ path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')|merge({_locale: locale})) }}">
+                                        <span class="flag-icon flag-icon-{{ flag }}"></span>
+                                    </a>
+                                {% endfor %}
                             </p>
                         {% endblock %}
                     </div>