diff --git a/footer.php b/footer.php
index f460fb7..679a2bf 100644
--- a/footer.php
+++ b/footer.php
@@ -12,7 +12,7 @@
 <footer class="content site-footer">
 	<p><?php yourls_e( 'Powered by <a href="http://yourls.org/">YOURLS</a>. Designed by <a href="http://tomslominski.net/">Tom Slominski</a>.', 'isq_translation') ?> <a class="icon-github" href="https://github.com/tomslominski/infinity-squared"><?php include('public/images/github.svg'); ?></a></p>
 	<?php if ( !empty(ISQ::$recaptcha['sitekey']) && !empty(ISQ::$recaptcha['secret']) ) { ?>
-		<p class="recaptcha-cookie">This site uses cookies for Google reCAPTCHA.<p>
+		<p class="recaptcha-cookie"><?php yourls_e('This site uses cookies for Google reCAPTCHA','isq_translation')?>.<p>
 	<?php }; ?>
 </div>
 </div>
diff --git a/public/languages/isq_translation-es_ES.mo b/public/languages/isq_translation-es_ES.mo
new file mode 100644
index 0000000..9172092
Binary files /dev/null and b/public/languages/isq_translation-es_ES.mo differ
diff --git a/public/languages/isq_translation-es_ES.po b/public/languages/isq_translation-es_ES.po
new file mode 100644
index 0000000..d8ff495
--- /dev/null
+++ b/public/languages/isq_translation-es_ES.po
@@ -0,0 +1,216 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Infinity Squared\n"
+"POT-Creation-Date: 2016-11-04 12:57+0100\n"
+"PO-Revision-Date: 2016-11-04 12:58+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: es_ES\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
+"X-Poedit-KeywordsList: yourls__;yourls_e;yourls_s;yourls_se;"
+"yourls_esc_attr__;yourls_esc_html__;yourls_x;yourls_ex;yourls_esc_attr_x;"
+"yourls_esc_html_x;yourls_n:1,2;yourls_nx:1,2;yourls_n_noop:1,2;"
+"yourls_nx_noop:1,2\n"
+"X-Poedit-Basepath: ../..\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SearchPath-0: public/languages\n"
+"X-Poedit-SearchPath-1: .\n"
+
+#: footer.php:3
+msgid "The bookmarklet"
+msgstr "El marcador"
+
+#: footer.php:5
+msgid "Save this as a bookmark."
+msgstr "Guardar como marcador"
+
+#: footer.php:6
+msgid ""
+"Add this to your bookmarks or drag it to your bookmarks bar to quickly "
+"access shortening functions."
+msgstr ""
+"Añada esto a sus marcadores, o arrástrelo a su barra de marcadores para "
+"acceder rápidamente a las funciones de acortado de urls"
+
+#: footer.php:7 index.php:59
+msgid "Shorten"
+msgstr "Acortar"
+
+#: footer.php:8
+msgid ""
+"This bookmarklet takes the page URL and title and opens a new tab, where you "
+"can fill out a CAPTCHA. If you have selected text before using the "
+"bookmarklet, that will be used as the keyword."
+msgstr ""
+"Este marcador toma la URL de la página y el título y abre una nueva pestaña, "
+"donde puede llenar una CAPTCHA. Si ha seleccionado texto antes de utilizar "
+"el marcador, se utilizará como palabra clave."
+
+#: footer.php:9
+msgid ""
+"Support for bookmarklets on mobile varies. For example, they work on Chrome "
+"for Android but you have to add and sync them from your desktop."
+msgstr ""
+"Soporte para marcadores en el móvil. Por ejemplo, trabajan en Chrome para "
+"Android, pero tienes que añadirlos y sincronizarlos desde tu escritorio."
+
+#: footer.php:13
+msgid ""
+"Powered by <a href=\"http://yourls.org/\">YOURLS</a>. Designed by <a href="
+"\"http://tomslominski.net/\">Tom Slominski</a>."
+msgstr ""
+"Desarrollado por <a href=\"http://yourls.org/\"> YOURLS </a>. Diseñado por "
+"<a href=\"http://tomslominski.net/\"> Tom Slominski </a>."
+
+#: footer.php:15
+msgid "This site uses cookies for Google reCAPTCHA"
+msgstr "Este sitio usa cookies para Google reCAPTCHA"
+
+#: index.php:10
+msgid "Enter a new URL to shorten"
+msgstr "Introduzca una url para acortarla"
+
+#: index.php:13
+msgid "Long URL"
+msgstr "URL Larga"
+
+#: index.php:14
+msgid "Paste the long URL here. This is required."
+msgstr "Pegue la URL larga aquí (Este campo es obligatorio)"
+
+#: index.php:20
+msgid "Custom keyword"
+msgstr "Personalizar palabra clave"
+
+#: index.php:21
+msgid "A keyword replaces the default short string."
+msgstr "Una palabra clave, reemplaza la cadena de caracteres por defecto"
+
+#: index.php:26
+msgid "Custom title"
+msgstr "Título personalizadon"
+
+#: index.php:27
+msgid ""
+"Optional title used when sharing a link from YOURLS using social sharers."
+msgstr ""
+"Título opcional usado cuando compartes en una red social un enlace usando "
+"los botones de abajo"
+
+#: index.php:44
+msgid "Verification"
+msgstr "Verificación"
+
+#: index.php:45
+msgid "reCAPTCHA verification used to ensure you are not a bot."
+msgstr "Verificación reCAPTCHA para asegurar que no eres un robot"
+
+#: public/config-sample.php:26
+msgid "Get ∞²!"
+msgstr "¡Obtener ∞²!"
+
+#: public/config-sample.php:30
+msgid "Admin area"
+msgstr "Área de administración"
+
+#: result.php:12
+msgid "&larr; Go home and try again"
+msgstr "&larr; Ir a inicio e intentarlo de nuevo"
+
+#: result.php:22
+msgid "You haven't entered a URL to shorten."
+msgstr ""
+"No has introducido una URL para acortar, por favor vuelva atrás e inténtelo "
+"de nuevo"
+
+#: result.php:27
+#, php-format
+msgid "The keyword %1$s is reserved."
+msgstr "La palabra clave %1$s está reservada"
+
+#: result.php:32
+#, php-format
+msgid "The keyword %1$s is taken."
+msgstr "La palabra clave %1$s ya está en uso"
+
+#: result.php:50
+msgid "Are you a bot? Google certainly thinks you are."
+msgstr ""
+"¿Eres un robot?. Google piensa que si... Por favor, vuelva atrás e inténtelo "
+"de nuevo"
+
+#: result.php:58
+msgid "Are you a bot? The verification was not completed successfully."
+msgstr ""
+"¿Eres un robot? La verificación no se ha completado correctamente. Por "
+"favor, vuelva atrás e inténtelo de nuevo"
+
+#: result.php:64
+msgid "Are you a bot? No antispam protection was completed successfully."
+msgstr ""
+"¿Eres un robot?. La protección anti spam no se ha completado correctamente. "
+"Por favor, vuelva atrás e inténtelo de nuevo"
+
+#: result.php:84
+msgid "The URL could not be shortened."
+msgstr "La URL no se ha podido acortar"
+
+#: result.php:101
+msgid "Your short URL"
+msgstr "Su URL acortada"
+
+#: result.php:105
+msgid "Original URL"
+msgstr "URL Original"
+
+#: result.php:108 result.php:124 result.php:139
+msgid "Copy to clipboard"
+msgstr "Copiar al portapapeles"
+
+#: result.php:109 result.php:125 result.php:140
+msgid "Copied to clipboard"
+msgstr "Copiado al portapapeles"
+
+#: result.php:111 result.php:127 result.php:142
+msgid "Press ⌘+C to copy"
+msgstr "Pulse  ⌘+C para copiar"
+
+#: result.php:112 result.php:128 result.php:143
+msgid "Press Ctrl+C to copy"
+msgstr "Haga clic en un enlace y presione CTRL +C para copiarlo."
+
+#: result.php:113 result.php:129 result.php:144
+msgid "Tap copy"
+msgstr "Tocar para copiar"
+
+#: result.php:114 result.php:130 result.php:145
+msgid "Failed to copy"
+msgstr "Falló al copiar"
+
+#: result.php:121
+msgid "Short URL"
+msgstr "Su URL acortada"
+
+#: result.php:136
+msgid "Stats"
+msgstr "Estadísticas"
+
+#: result.php:153
+msgid "Share"
+msgstr "Compartir"
+
+#: result.php:154
+msgid "Share your short URL"
+msgstr "Compartir su URL corta"
+
+#: result.php:175
+msgid "QR code"
+msgstr "Código QR"
+
+#: result.php:176
+msgid "Share your link with external devices"
+msgstr "Comparta su enlace con dispositivos externos"
diff --git a/public/languages/isq_translation-source.pot b/public/languages/isq_translation-source.pot
index d8db1b7..d443a24 100755
--- a/public/languages/isq_translation-source.pot
+++ b/public/languages/isq_translation-source.pot
@@ -1,22 +1,24 @@
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Infinity Squared\n"
-"POT-Creation-Date: 2015-03-22 19:25-0000\n"
+"POT-Creation-Date: 2016-11-04 12:50+0100\n"
 "PO-Revision-Date: 2015-03-22 19:25-0000\n"
 "Last-Translator: Tom Slominski <me@tomslominski>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.7.5\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Poedit-KeywordsList: yourls__;yourls_e;yourls_s;yourls_se;"
 "yourls_esc_attr__;yourls_esc_html__;yourls_x;yourls_ex;yourls_esc_attr_x;"
 "yourls_esc_html_x;yourls_n:1,2;yourls_nx:1,2;yourls_n_noop:1,2;"
 "yourls_nx_noop:1,2\n"
-"X-Poedit-Basepath: .\n"
+"X-Poedit-Basepath: ../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-SearchPath-0: public/languages\n"
+"X-Poedit-SearchPath-1: .\n"
 
 #: footer.php:3
 msgid "The bookmarklet"
@@ -32,7 +34,7 @@ msgid ""
 "access shortening functions."
 msgstr ""
 
-#: footer.php:7 index.php:61
+#: footer.php:7 index.php:59
 msgid "Shorten"
 msgstr ""
 
@@ -55,8 +57,8 @@ msgid ""
 "\"http://tomslominski.net/\">Tom Slominski</a>."
 msgstr ""
 
-#: footer.php:31
-msgid "Copied!"
+#: footer.php:15
+msgid "This site uses cookies for Google reCAPTCHA"
 msgstr ""
 
 #: index.php:10
@@ -71,88 +73,125 @@ msgstr ""
 msgid "Paste the long URL here. This is required."
 msgstr ""
 
-#: index.php:21
+#: index.php:20
 msgid "Custom keyword"
 msgstr ""
 
-#: index.php:22
+#: index.php:21
 msgid "A keyword replaces the default short string."
 msgstr ""
 
-#: index.php:27
+#: index.php:26
 msgid "Custom title"
 msgstr ""
 
-#: index.php:28
+#: index.php:27
 msgid ""
 "Optional title used when sharing a link from YOURLS using social sharers."
 msgstr ""
 
-#: index.php:46
+#: index.php:44
 msgid "Verification"
 msgstr ""
 
-#: index.php:47
+#: index.php:45
 msgid "reCAPTCHA verification used to ensure you are not a bot."
 msgstr ""
 
-#: result.php:17
-msgid "You haven't entered a URL to shorten. Please go back and try again."
+#: public/config-sample.php:26
+msgid "Get ∞²!"
 msgstr ""
 
-#: result.php:35
-msgid ""
-"Are you a bot? Google certainly thinks you are. Please go back and try again."
+#: public/config-sample.php:30
+msgid "Admin area"
 msgstr ""
 
-#: result.php:43
-msgid ""
-"Are you a bot? The verification was not completed successfully. Please go "
-"back and try again."
+#: result.php:12
+msgid "&larr; Go home and try again"
 msgstr ""
 
-#: result.php:49
-msgid ""
-"Are you a bot? No antispam protection was completed successfully. Please go "
-"back and try again."
+#: result.php:22
+msgid "You haven't entered a URL to shorten."
 msgstr ""
 
-#: result.php:92
+#: result.php:27
+#, php-format
+msgid "The keyword %1$s is reserved."
+msgstr ""
+
+#: result.php:32
+#, php-format
+msgid "The keyword %1$s is taken."
+msgstr ""
+
+#: result.php:50
+msgid "Are you a bot? Google certainly thinks you are."
+msgstr ""
+
+#: result.php:58
+msgid "Are you a bot? The verification was not completed successfully."
+msgstr ""
+
+#: result.php:64
+msgid "Are you a bot? No antispam protection was completed successfully."
+msgstr ""
+
+#: result.php:84
+msgid "The URL could not be shortened."
+msgstr ""
+
+#: result.php:101
 msgid "Your short URL"
 msgstr ""
 
-#: result.php:96
+#: result.php:105
 msgid "Original URL"
 msgstr ""
 
-#: result.php:98 result.php:106 result.php:112
+#: result.php:108 result.php:124 result.php:139
 msgid "Copy to clipboard"
 msgstr ""
 
-#: result.php:104
-msgid "Short URL"
+#: result.php:109 result.php:125 result.php:140
+msgid "Copied to clipboard"
 msgstr ""
 
-#: result.php:110
-msgid "Stats"
+#: result.php:111 result.php:127 result.php:142
+msgid "Press ⌘+C to copy"
 msgstr ""
 
-#: result.php:117
-msgid "Click on a link and press Ctrl+C to quickly copy it."
+#: result.php:112 result.php:128 result.php:143
+msgid "Press Ctrl+C to copy"
+msgstr ""
+
+#: result.php:113 result.php:129 result.php:144
+msgid "Tap copy"
+msgstr ""
+
+#: result.php:114 result.php:130 result.php:145
+msgid "Failed to copy"
 msgstr ""
 
 #: result.php:121
+msgid "Short URL"
+msgstr ""
+
+#: result.php:136
+msgid "Stats"
+msgstr ""
+
+#: result.php:153
 msgid "Share"
 msgstr ""
 
-#: result.php:122
+#: result.php:154
 msgid "Share your short URL"
 msgstr ""
 
-#: result.php:140
+#: result.php:175
 msgid "QR code"
 msgstr ""
 
-#: result.php:140
+#: result.php:176
 msgid "Share your link with external devices"
 msgstr ""