diff --git a/l10n/es/admin.po b/l10n/es/admin.po
new file mode 100644
index 0000000000..af814907b9
--- /dev/null
+++ b/l10n/es/admin.po
@@ -0,0 +1,93 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt \n"
+"Language-Team: LANGUAGE \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"
+
+#: ../templates/app.php:22
+msgid "read more"
+msgstr "leer más"
+
+#: ../templates/app.php:24
+msgid "INSTALL"
+msgstr "Instalar"
+
+#: ../templates/app_noconn.php:6 ../templates/apps.php:6
+msgid "Apps Repository"
+msgstr "Repositorio de aplicaciones "
+
+#: ../templates/app_noconn.php:7
+msgid "Cannot connect to apps repository"
+msgstr "No se pudo conectar con el repositorio de aplicaciones"
+
+#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15
+#: ../templates/users.php:51
+msgid "Name"
+msgstr "Nombre"
+
+#: ../templates/apps.php:14
+msgid "Modified"
+msgstr "Modificado"
+
+#: ../templates/system.php:6
+msgid "Administration"
+msgstr "Administración"
+
+#: ../templates/system.php:7
+msgid "System Settings"
+msgstr "Ajustes del Sistema"
+
+#: ../templates/users.php:2
+msgid "Users"
+msgstr "Usuarios"
+
+#: ../templates/users.php:7 ../templates/users.php:47
+msgid "Groups"
+msgstr "Grupos"
+
+#: ../templates/users.php:16
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../templates/users.php:25
+msgid "Create"
+msgstr "Crear"
+
+#: ../templates/users.php:37 ../templates/users.php:69
+msgid "remove"
+msgstr "Eliminar"
+
+#: ../templates/users.php:59
+msgid "Create group"
+msgstr "Crear grupo"
+
+#: ../templates/users.php:95
+msgid "Force new password:"
+msgstr "Forzar una nueva contraseña"
+
+#: ../templates/users.php:97
+msgid "Set"
+msgstr "Aplicar"
+
+#: ../templates/users.php:103
+msgid "Do you really want to delete user"
+msgstr "¿Seguro que quieres eliminar este usuario?"
+
+#: ../templates/users.php:110
+msgid "Do you really want to delete group"
+msgstr "¿Seguro que quieres eliminar este grupo?"
+
+
diff --git a/l10n/es/core.po b/l10n/es/core.po
new file mode 100644
index 0000000000..b8a5ace312
--- /dev/null
+++ b/l10n/es/core.po
@@ -0,0 +1,129 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt \n"
+"Language-Team: LANGUAGE \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"
+
+#: ../templates/404.php:15
+msgid "Error 404, Cloud not found"
+msgstr "Error 404, La pagina no se pudo encontrar"
+
+#: ../templates/installation.php:6
+msgid "ownCloud is your personal web storage."
+msgstr "ownCloud es tu web de almacenamiento personal."
+
+#: ../templates/installation.php:7
+msgid "Finish the setup by following the steps below."
+msgstr "Completa la instalación mediante los siguientes pasos."
+
+#: ../templates/installation.php:26
+msgid "Create an admin account."
+msgstr "Crear una cuenta de administrador."
+
+#: ../templates/installation.php:27
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: ../templates/installation.php:28
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../templates/installation.php:31
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: ../templates/installation.php:34
+msgid "Set where to store the data."
+msgstr "Selecciona donde quieres almacenar los datos."
+
+#: ../templates/installation.php:35
+msgid "Data directory:"
+msgstr "Directorio de almacenamiento:"
+
+#: ../templates/installation.php:39
+msgid "Configure the database."
+msgstr "Configurar la base de datos."
+
+#: ../templates/installation.php:43
+msgid "SQLite will be used for the database. You have nothing to do."
+msgstr ""
+"Se utilizará SQLite para la base de datos. No necesitas configurar nada más."
+
+#: ../templates/installation.php:46
+msgid "SQLite"
+msgstr "SQLite"
+
+#: ../templates/installation.php:53
+msgid "MySQL will be used for the database."
+msgstr "Se utilizará MySQL para la base de datos."
+
+#: ../templates/installation.php:59
+msgid "MySQL username:"
+msgstr "Nombre de usuario de MySQL:"
+
+#: ../templates/installation.php:60
+msgid "MySQL password:"
+msgstr "Contraseña de MySQL:"
+
+#: ../templates/installation.php:61
+msgid "Database name:"
+msgstr "Nombre de la base de datos:"
+
+#: ../templates/installation.php:62
+msgid "Host:"
+msgstr "Host:"
+
+#: ../templates/installation.php:63
+msgid "Table prefix:"
+msgstr "Prefijo de la tabla:"
+
+#: ../templates/installation.php:69
+msgid "Finish setup"
+msgstr "Completar la instalación"
+
+#: ../templates/layout.guest.php:33
+msgid ""
+"ownCloud is a personal cloud which runs"
+" on your own server.
"
+msgstr ""
+"ownCloud es tu nube personal que corre "
+"en tu propio servidor."
+
+#: ../templates/login.php:6
+msgid "Login failed!"
+msgstr "¡No se pudo iniciar sesión!"
+
+#: ../templates/login.php:11 ../templates/login.php:15
+msgid "Remember login"
+msgstr "Recordarme"
+
+#: ../templates/logout.php:1
+msgid "You are logged out."
+msgstr "Has cerrado sesión."
+
+#: ../templates/part.pagenavi.php:6
+msgid "prev"
+msgstr "anterior"
+
+#: ../templates/part.pagenavi.php:26
+msgid "next"
+msgstr "siguiente"
+
+#: ../templates/part.searchbox.php:3
+msgid "Search"
+msgstr "Buscar"
+
+
diff --git a/l10n/es/help.po b/l10n/es/help.po
new file mode 100644
index 0000000000..96eda9c397
--- /dev/null
+++ b/l10n/es/help.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt \n"
+"Language-Team: LANGUAGE \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"
+
+#: ../templates/index.php:2
+msgid "Questions and Answers"
+msgstr "Preguntas y Respuestas"
+
+#: ../templates/index.php:24
+msgid "ASK A QUESTION"
+msgstr "Haz una pregunta"
+
+
diff --git a/l10n/es/log.po b/l10n/es/log.po
new file mode 100644
index 0000000000..ca17c9328f
--- /dev/null
+++ b/l10n/es/log.po
@@ -0,0 +1,68 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt \n"
+"Language-Team: LANGUAGE \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"
+
+#: ../templates/index.php:4
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../templates/index.php:7
+msgid "Logins"
+msgstr "Inicios de sesión"
+
+#: ../templates/index.php:8
+msgid "Logouts"
+msgstr "Cierres de sesión"
+
+#: ../templates/index.php:9
+msgid "Downloads"
+msgstr "Descargas"
+
+#: ../templates/index.php:10
+msgid "Uploads"
+msgstr "Subidas"
+
+#: ../templates/index.php:11
+msgid "Creations"
+msgstr "Creaciones"
+
+#: ../templates/index.php:12
+msgid "Deletions"
+msgstr "Eliminaciones"
+
+#: ../templates/index.php:15
+msgid "Show:"
+msgstr "Mostrar"
+
+#: ../templates/index.php:16
+msgid "entries per page."
+msgstr "Entradas por página."
+
+#: ../templates/index.php:26
+msgid "What"
+msgstr "Qué"
+
+#: ../templates/index.php:27
+msgid "When"
+msgstr "Cuándo"
+
+#: ../templates/index.php:45
+msgid "Clear log entries before"
+msgstr "Eliminar los registros anteriores a"
+
+
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
new file mode 100644
index 0000000000..d4c9878a74
--- /dev/null
+++ b/l10n/es/settings.po
@@ -0,0 +1,88 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# , 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
+"POT-Creation-Date: 2011-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt \n"
+"Language-Team: LANGUAGE \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"
+
+#: ../templates/index.php:3
+msgid "Account information"
+msgstr "Información de la cuenta"
+
+#: ../templates/index.php:5
+msgid "You're currently using"
+msgstr "Estás utilizando"
+
+#: ../templates/index.php:5
+msgid "of your"
+msgstr "de tus"
+
+#: ../templates/index.php:5
+msgid "space"
+msgstr "de espacio total"
+
+#: ../templates/index.php:11
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: ../templates/index.php:12
+msgid "Your password got changed"
+msgstr "Tu contraseña ha sido cambiada"
+
+#: ../templates/index.php:15
+msgid "Old password:"
+msgstr "Antigua contraseña:"
+
+#: ../templates/index.php:19
+msgid "New password"
+msgstr "Nueva contraseña:"
+
+#: ../templates/index.php:24
+msgid "Show new password"
+msgstr "Mostrar nueva contraseña"
+
+#: ../templates/index.php:34
+msgid "Language"
+msgstr "Idioma"
+
+#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13
+msgid "Authentication error"
+msgstr "Error de autentificación"
+
+#: ../ajax/changepassword.php:19
+msgid "You have to enter the old and the new password!"
+msgstr "¡Tienes que introducir la contraseña antigua y la contraseña nueva!"
+
+#: ../ajax/changepassword.php:25
+msgid "Your old password is wrong!"
+msgstr "¡Tu contraseña antigua es incorrecta!"
+
+#: ../ajax/changepassword.php:31
+msgid "Password changed"
+msgstr "Contraseña cambiada"
+
+#: ../ajax/changepassword.php:34
+msgid "Unable to change password"
+msgstr "No se puede cambiar la contraseña"
+
+#: ../ajax/setlanguage.php:21
+msgid "Language changed"
+msgstr "Idioma cambiado"
+
+#: ../ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "Solicitud no válida"
+
+
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 9546fca7ea..a9e8831d2e 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
"POT-Creation-Date: 2011-07-27 12:03+0200\n"
-"PO-Revision-Date: 2011-07-30 07:25+0000\n"
+"PO-Revision-Date: 2011-07-30 20:10+0000\n"
"Last-Translator: rom1dep \n"
"Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
"MIME-Version: 1.0\n"
@@ -101,7 +101,7 @@ msgid ""
" on your own server."
msgstr ""
"ownCloud est votre solution cloud "
-"personnelle qui tourne sur votre propre serveur."
+"personnelle propulsée par votre propre serveur."
#: ../templates/login.php:6
msgid "Login failed!"