diff --git a/krynn/lang/es/messages.po b/krynn/lang/es/messages.po
new file mode 100644
index 000000000..e2015a379
--- /dev/null
+++ b/krynn/lang/es/messages.po
@@ -0,0 +1,32 @@
+# ADDON krynn
+# Copyright (C)
+# This file is distributed under the same license as the Friendica krynn addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-19 11:42+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: krynn.php:150
+msgid "Krynn Settings"
+msgstr "Ajustes de Krynn"
+
+#: krynn.php:152
+msgid "Enable Krynn Plugin"
+msgstr "Habilitar Plugin de Krynn"
+
+#: krynn.php:158
+msgid "Submit"
+msgstr "Enviar"
diff --git a/krynn/lang/es/strings.php b/krynn/lang/es/strings.php
index 3369d1b4b..77df4d4e6 100644
--- a/krynn/lang/es/strings.php
+++ b/krynn/lang/es/strings.php
@@ -1,5 +1,10 @@
-<?php
-
-$a->strings["Krynn Settings"] = "Configuración de Krynn";
-$a->strings["Enable Krynn Plugin"] = "Activar el módulo de planetas Krynn";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Krynn Settings"] = "Ajustes de Krynn";
+$a->strings["Enable Krynn Plugin"] = "Habilitar Plugin de Krynn";
+$a->strings["Submit"] = "Enviar";
diff --git a/langfilter/lang/es/messages.po b/langfilter/lang/es/messages.po
new file mode 100644
index 000000000..911fb90bc
--- /dev/null
+++ b/langfilter/lang/es/messages.po
@@ -0,0 +1,70 @@
+# ADDON langfilter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica langfilter addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-22 15:18+0200\n"
+"PO-Revision-Date: 2016-11-19 11:47+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: langfilter.php:44
+msgid "Language Filter"
+msgstr "Filtro de Idioma"
+
+#: langfilter.php:45
+msgid ""
+"This addon tries to identify the language of a postings. If it does not "
+"match any language spoken by you (see below) the posting will be collapsed. "
+"Remember detecting the language is not perfect, especially with short "
+"postings."
+msgstr "Este addon intenta identificar el idioma de las publicaciones. Si no encuentra ningún idioma hablado por usted (ver abajo) la entrada se colapsará. Recordar detectar el idioma no es perfecto, especialmente con entradas cortas."
+
+#: langfilter.php:46
+msgid "Use the language filter"
+msgstr "Usar el filtro de idioma"
+
+#: langfilter.php:47
+msgid "I speak"
+msgstr "Yo hablo"
+
+#: langfilter.php:47
+msgid ""
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Lista de abreviaciones (códigos iso2) para los idiomas que habla, separadas por comas. Por ejemplo \"de,it\"."
+
+#: langfilter.php:48
+msgid "Minimum confidence in language detection"
+msgstr "Mínima confianza en la detección de idioma"
+
+#: langfilter.php:48
+msgid ""
+"Minimum confidence in language detection being correct, from 0 to 100. Posts"
+" will not be filtered when the confidence of language detection is below "
+"this percent value."
+msgstr "Mínima confianza en que la detección de idioma sea correcta, de 0 a 100. Las entradas no se filtrarán cuando la confianza de la detección del idioma es inferior a su valor de porcentaje."
+
+#: langfilter.php:49
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
+
+#: langfilter.php:73
+msgid "Language Filter Settings saved."
+msgstr "Ajustes de Filtro de Idioma guardados."
+
+#: langfilter.php:123
+#, php-format
+msgid "unspoken language %s - Click to open/close"
+msgstr "Idioma sobreentendido %s - Click para abrir/cerrar"
diff --git a/langfilter/lang/es/strings.php b/langfilter/lang/es/strings.php
new file mode 100644
index 000000000..15a6d5742
--- /dev/null
+++ b/langfilter/lang/es/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Language Filter"] = "Filtro de Idioma";
+$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Este addon intenta identificar el idioma de las publicaciones. Si no encuentra ningún idioma hablado por usted (ver abajo) la entrada se colapsará. Recordar detectar el idioma no es perfecto, especialmente con entradas cortas.";
+$a->strings["Use the language filter"] = "Usar el filtro de idioma";
+$a->strings["I speak"] = "Yo hablo";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista de abreviaciones (códigos iso2) para los idiomas que habla, separadas por comas. Por ejemplo \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Mínima confianza en la detección de idioma";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Mínima confianza en que la detección de idioma sea correcta, de 0 a 100. Las entradas no se filtrarán cuando la confianza de la detección del idioma es inferior a su valor de porcentaje.";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Language Filter Settings saved."] = "Ajustes de Filtro de Idioma guardados.";
+$a->strings["unspoken language %s - Click to open/close"] = "Idioma sobreentendido %s - Click para abrir/cerrar";
diff --git a/tictac/lang/es/messages.po b/tictac/lang/es/messages.po
new file mode 100644
index 000000000..d503d47d6
--- /dev/null
+++ b/tictac/lang/es/messages.po
@@ -0,0 +1,74 @@
+# ADDON tictac
+# Copyright (C)
+# This file is distributed under the same license as the Friendica tictac addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-19 11:32+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tic-Tac-Toe tridimensional"
+
+#: tictac.php:53
+msgid "3D Tic-Tac-Toe"
+msgstr "3D Tic-Tac-Toe"
+
+#: tictac.php:58
+msgid "New game"
+msgstr "Nuevo juego"
+
+#: tictac.php:59
+msgid "New game with handicap"
+msgstr "Nuevo juego con desventajas"
+
+#: tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "El Tic-tac-toe tridimensional es como el juego tradicional excepto porque se juega en múltiples niveles simultáneamente. "
+
+#: tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "En este caso hay tres niveles. Usted gana consiguiendo tres seguidos en cualquier nivel, así como cruzando arriba, abajo y diagonalmente los distintos niveles."
+
+#: tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "El juego con desventajas deshabilita la posición central en el nivel medio porque la capa de este cuadrado a menudo tiene una ventaja injusta."
+
+#: tictac.php:182
+msgid "You go first..."
+msgstr "Usted va primero..."
+
+#: tictac.php:187
+msgid "I'm going first this time..."
+msgstr "Yo voy primero esta vez..."
+
+#: tictac.php:193
+msgid "You won!"
+msgstr "¡Usted ha ganado!"
+
+#: tictac.php:199 tictac.php:224
+msgid "\"Cat\" game!"
+msgstr "¡Juego \"Gato\"!"
+
+#: tictac.php:222
+msgid "I won!"
+msgstr "¡Yo gané!"
diff --git a/tictac/lang/es/strings.php b/tictac/lang/es/strings.php
index 65a735319..600c84cf3 100644
--- a/tictac/lang/es/strings.php
+++ b/tictac/lang/es/strings.php
@@ -1,14 +1,19 @@
-<?php
-
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tres en Raya tridimensional";
-$a->strings["3D Tic-Tac-Toe"] = "Tres en Raya 3D";
-$a->strings["New game"] = "Nueva partida";
-$a->strings["New game with handicap"] = "Nuevo juego con handicap";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tres en Raya tridimensional es como el juego tradicional, excepto que se juega en varios niveles simultáneamente.";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En este caso hay tres niveles. Ganarás por conseguir tres en raya en cualquier nivel, así como arriba, abajo y en diagonal a través de los diferentes niveles.";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El juego con handicap desactiva la posición central en el nivel medio porque el jugador que la ocupa tiene a menudo una ventaja injusta.";
-$a->strings["You go first..."] = "Comienzas tú...";
-$a->strings["I'm going first this time..."] = "Yo voy primero esta vez...";
-$a->strings["You won!"] = "¡Has ganado!";
-$a->strings["\"Cat\" game!"] = "¡Empate!";
-$a->strings["I won!"] = "¡He ganado!";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Nuevo juego";
+$a->strings["New game with handicap"] = "Nuevo juego con desventajas";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "El Tic-tac-toe tridimensional es como el juego tradicional excepto porque se juega en múltiples niveles simultáneamente. ";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En este caso hay tres niveles. Usted gana consiguiendo tres seguidos en cualquier nivel, así como cruzando arriba, abajo y diagonalmente los distintos niveles.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El juego con desventajas deshabilita la posición central en el nivel medio porque la capa de este cuadrado a menudo tiene una ventaja injusta.";
+$a->strings["You go first..."] = "Usted va primero...";
+$a->strings["I'm going first this time..."] = "Yo voy primero esta vez...";
+$a->strings["You won!"] = "¡Usted ha ganado!";
+$a->strings["\"Cat\" game!"] = "¡Juego \"Gato\"!";
+$a->strings["I won!"] = "¡Yo gané!";
diff --git a/uhremotestorage/lang/es/messages.po b/uhremotestorage/lang/es/messages.po
new file mode 100644
index 000000000..9b3de0081
--- /dev/null
+++ b/uhremotestorage/lang/es/messages.po
@@ -0,0 +1,45 @@
+# ADDON uhremotestorage
+# Copyright (C)
+# This file is distributed under the same license as the Friendica uhremotestorage addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2016-11-19 11:35+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: uhremotestorage.php:84
+#, php-format
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled"
+" storage (like ownCloud). See <a "
+"href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
+" WebFinger</a>"
+msgstr "Permite usar su ID de Friendica (%s) para conectar a un almacén habilitado externo sin hospedar (como ownCloud). Vea <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+
+#: uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr "Plantilla de URL (con {categoría})"
+
+#: uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr "Punto final de OAuth"
+
+#: uhremotestorage.php:87
+msgid "Api"
+msgstr "API"
+
+#: uhremotestorage.php:89
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
diff --git a/uhremotestorage/lang/es/strings.php b/uhremotestorage/lang/es/strings.php
index 16c28a755..910a0562f 100644
--- a/uhremotestorage/lang/es/strings.php
+++ b/uhremotestorage/lang/es/strings.php
@@ -1,7 +1,12 @@
-<?php
-
-$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Permitir el uso de tu ID de Friendica (%s) para conexiones de almacenamiento externo sin alojamiento activado (como OwnCloud). Mira <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
-$a->strings["Template URL (with {category})"] = "Dirección de la plantilla (con {categoría})";
-$a->strings["OAuth end-point"] = "Punto final OAuth";
-$a->strings["Api"] = "API";
-$a->strings["Submit"] = "Envíar";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Permite usar su ID de Friendica (%s) para conectar a un almacén habilitado externo sin hospedar (como ownCloud). Vea <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Template URL (with {category})"] = "Plantilla de URL (con {categoría})";
+$a->strings["OAuth end-point"] = "Punto final de OAuth";
+$a->strings["Api"] = "API";
+$a->strings["Save Settings"] = "Guardar Ajustes";
diff --git a/windowsphonepush/lang/es/messages.po b/windowsphonepush/lang/es/messages.po
new file mode 100644
index 000000000..7d561c218
--- /dev/null
+++ b/windowsphonepush/lang/es/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2016-11-19 11:41+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "Ajustes de WindowsPhonePush actualizados."
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "Ajustes de WindowsPhonePush"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Plugin"
+msgstr "Habilitar Plugin de WindowsPhonePush"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Empujar texto de nuevo objeto"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
diff --git a/windowsphonepush/lang/es/strings.php b/windowsphonepush/lang/es/strings.php
new file mode 100644
index 000000000..22a5c4c5c
--- /dev/null
+++ b/windowsphonepush/lang/es/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "Ajustes de WindowsPhonePush actualizados.";
+$a->strings["WindowsPhonePush Settings"] = "Ajustes de WindowsPhonePush";
+$a->strings["Enable WindowsPhonePush Plugin"] = "Habilitar Plugin de WindowsPhonePush";
+$a->strings["Push text of new item"] = "Empujar texto de nuevo objeto";
+$a->strings["Save Settings"] = "Guardar Ajustes";
diff --git a/wppost/lang/es/messages.po b/wppost/lang/es/messages.po
new file mode 100644
index 000000000..98365fb19
--- /dev/null
+++ b/wppost/lang/es/messages.po
@@ -0,0 +1,64 @@
+# ADDON wppost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica wppost addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-19 11:38+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: wppost.php:42
+msgid "Post to Wordpress"
+msgstr "Publicar en Wordpress"
+
+#: wppost.php:76
+msgid "WordPress Post Settings"
+msgstr "Ajustes de publicación de WordPress"
+
+#: wppost.php:78
+msgid "Enable WordPress Post Plugin"
+msgstr "Habilitar Plugin de publicación de WordPress"
+
+#: wppost.php:83
+msgid "WordPress username"
+msgstr "Nombre de usuario de WordPress"
+
+#: wppost.php:88
+msgid "WordPress password"
+msgstr "Contraseña de WordPress"
+
+#: wppost.php:93
+msgid "WordPress API URL"
+msgstr "URL de API de WordPress"
+
+#: wppost.php:98
+msgid "Post to WordPress by default"
+msgstr "Publicar en WordPress por defecto"
+
+#: wppost.php:103
+msgid "Provide a backlink to the Friendica post"
+msgstr "Proveer un enlace inverso a la entrada de Friendica"
+
+#: wppost.php:110
+msgid "Submit"
+msgstr "Enviar"
+
+#: wppost.php:201
+msgid "Post from Friendica"
+msgstr "Publicar desde Friendica"
+
+#: wppost.php:207
+msgid "Read the original post and comment stream on Friendica"
+msgstr "Leer la entrada original y transmitir comentarios en Friendica"
diff --git a/wppost/lang/es/strings.php b/wppost/lang/es/strings.php
index 1e01a2f48..525cb8834 100644
--- a/wppost/lang/es/strings.php
+++ b/wppost/lang/es/strings.php
@@ -1,13 +1,18 @@
-<?php
-
-$a->strings["Post to Wordpress"] = "Publicar en Wordpress";
-$a->strings["WordPress Post Settings"] = "Configuración de publicación en Wordpres";
-$a->strings["Enable WordPress Post Plugin"] = "Habilitar el módulo de publicación en Wordpress";
-$a->strings["WordPress username"] = "WordPress - nombre de usuario";
-$a->strings["WordPress password"] = "WordPress - contraseña";
-$a->strings["WordPress API URL"] = "WordPress - dirección API";
-$a->strings["Post to WordPress by default"] = "Publicar a WordPress por defecto";
-$a->strings["Provide a backlink to the Friendica post"] = "Añade un enlace de vuelta a la publicación de Friendica";
-$a->strings["Submit"] = "Envíar";
-$a->strings["Post from Friendica"] = "Publicado desde Friendica";
-$a->strings["Read the original post and comment stream on Friendica"] = "Leer la publicación original y los comentarios en Friendica";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Wordpress"] = "Publicar en Wordpress";
+$a->strings["WordPress Post Settings"] = "Ajustes de publicación de WordPress";
+$a->strings["Enable WordPress Post Plugin"] = "Habilitar Plugin de publicación de WordPress";
+$a->strings["WordPress username"] = "Nombre de usuario de WordPress";
+$a->strings["WordPress password"] = "Contraseña de WordPress";
+$a->strings["WordPress API URL"] = "URL de API de WordPress";
+$a->strings["Post to WordPress by default"] = "Publicar en WordPress por defecto";
+$a->strings["Provide a backlink to the Friendica post"] = "Proveer un enlace inverso a la entrada de Friendica";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Post from Friendica"] = "Publicar desde Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "Leer la entrada original y transmitir comentarios en Friendica";
diff --git a/yourls/lang/es/messages.po b/yourls/lang/es/messages.po
new file mode 100644
index 000000000..bf8110ff2
--- /dev/null
+++ b/yourls/lang/es/messages.po
@@ -0,0 +1,48 @@
+# ADDON yourls
+# Copyright (C)
+# This file is distributed under the same license as the Friendica yourls addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-19 11:40+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: yourls.php:55
+msgid "YourLS Settings"
+msgstr "Sus Ajustes LS"
+
+#: yourls.php:57
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: yourls.php:62
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: yourls.php:67
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: yourls.php:72
+msgid "Use SSL "
+msgstr "Usar SSL "
+
+#: yourls.php:76
+msgid "Submit"
+msgstr "Enviar"
+
+#: yourls.php:92
+msgid "yourls Settings saved."
+msgstr "Sus Ajustes de han guardado."
diff --git a/yourls/lang/es/strings.php b/yourls/lang/es/strings.php
index 925b62ada..d2845438f 100644
--- a/yourls/lang/es/strings.php
+++ b/yourls/lang/es/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["YourLS Settings"] = "Tu configuración LS";
-$a->strings["URL: http://"] = "Dirección: http://";
-$a->strings["Username:"] = "Nombre de Usuario:";
-$a->strings["Password:"] = "Contraseña:";
-$a->strings["Use SSL "] = "Usar SSL ";
-$a->strings["Submit"] = "Envíar";
-$a->strings["yourls Settings saved."] = "La configuración se ha guardado.";
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["YourLS Settings"] = "Sus Ajustes LS";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "Nombre de usuario:";
+$a->strings["Password:"] = "Contraseña:";
+$a->strings["Use SSL "] = "Usar SSL ";
+$a->strings["Submit"] = "Enviar";
+$a->strings["yourls Settings saved."] = "Sus Ajustes de han guardado.";