Merge branch 'master' of github.com:owncloud/core into vcategories_db

1 files changed, 14 insertions, 21 deletions

diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index c8a6f5b67c8..abcc1832f32 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-17 02:03+0200\n"
-"PO-Revision-Date: 2012-09-17 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-23 02:01+0200\n"
+"PO-Revision-Date: 2012-09-22 10:45+0000\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +44,7 @@ msgstr "El grupo ya existe"
 msgid "Unable to add group"
 msgstr "No se pudo añadir el grupo"
 
-#: ajax/enableapp.php:13
+#: ajax/enableapp.php:14
 msgid "Could not enable app. "
 msgstr "No puedo habilitar la app."
 
@@ -86,15 +86,11 @@ msgstr "Imposible añadir el usuario al grupo %s"
 msgid "Unable to remove user from group %s"
 msgstr "Imposible eliminar al usuario del grupo %s"
 
-#: js/apps.js:18
-msgid "Error"
-msgstr "Error"
-
-#: js/apps.js:39 js/apps.js:73
+#: js/apps.js:27 js/apps.js:61
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:39 js/apps.js:62
+#: js/apps.js:27 js/apps.js:50
 msgid "Enable"
 msgstr "Activar"
 
@@ -125,7 +121,7 @@ msgstr "Cron"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Ejecutar una tarea con cada página cargada"
 
 #: templates/admin.php:43
 msgid ""
@@ -137,11 +133,11 @@ msgstr "cron.php está registrado como un servicio del webcron. Llama a la pági
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Usar el servicio de cron del sitema. Llame al fichero cron.php en la carpeta de owncloud via servidor cronjob cada minuto."
 
 #: templates/admin.php:56
 msgid "Sharing"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
@@ -234,12 +230,9 @@ msgid "Answer"
 msgstr "Respuesta"
 
 #: templates/personal.php:8
-msgid "You use"
-msgstr "Estás utilizando"
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr "del total disponible de"
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "Ha usado <strong>%s</strong> de <strong>%s<strong> disponible"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -250,8 +243,8 @@ msgid "Download"
 msgstr "Descargar"
 
 #: templates/personal.php:19
-msgid "Your password got changed"
-msgstr "Tu contraseña ha sido cambiada"
+msgid "Your password was changed"
+msgstr "Su contraseña ha sido cambiada"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"