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

1 files changed, 18 insertions, 3 deletions

diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index d07149d8595..3837cf49f99 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -8,7 +8,8 @@
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Files" => "Archivos",
 "Unshare" => "Dejar de compartir",
-"Delete" => "Eliminado",
+"Delete" => "Eliminar",
+"Rename" => "Renombrar",
 "already exists" => "ya existe",
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
@@ -22,15 +23,30 @@
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
 "Pending" => "Pendiente",
+"1 file uploading" => "subiendo 1 archivo",
+"files uploading" => "archivos subiendo",
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
 "Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
+"files scanned" => "archivos escaneados",
+"error while scanning" => "error escaneando",
+"Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
 "folder" => "carpeta",
 "folders" => "carpetas",
 "file" => "archivo",
 "files" => "archivos",
+"seconds ago" => "hace segundos",
+"minute ago" => "minuto",
+"minutes ago" => "hace minutos",
+"today" => "hoy",
+"yesterday" => "ayer",
+"days ago" => "días",
+"last month" => "mes pasado",
+"months ago" => "hace meses",
+"last year" => "año pasado",
+"years ago" => "hace años",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "Tamaño máximo de subida",
 "max. possible: " => "máx. posible:",
@@ -46,11 +62,10 @@
 "Upload" => "Subir",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
-"Name" => "Nombre",
 "Share" => "Compartir",
 "Download" => "Descargar",
 "Upload too large" => "El archivo es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor.",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
-"Current scanning" => "Escaneo actual"
+"Current scanning" => "Ahora escaneando"
 );