diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 11:18:00 +0200 |
| commit | fc76a13c520d1d5345c721e0616d770e1fd344ea (patch) | |
| tree | 1dc8e108588a52182e0c8c346423aab171e66944 /core/l10n/es.php | |
| parent | 534d93d2d3d549039db2661cdc4b9e939a0abe0d (diff) | |
| parent | 9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0 (diff) | |
| download | nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.tar.gz nextcloud-server-fc76a13c520d1d5345c721e0616d770e1fd344ea.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/public/share.php
Diffstat (limited to 'core/l10n/es.php')
| -rw-r--r-- | core/l10n/es.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/l10n/es.php b/core/l10n/es.php index 9e34e6f4ac3..3aa0c3f732c 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -48,10 +48,11 @@ $TRANSLATIONS = array( "last year" => "el año pasado", "years ago" => "años antes", "Choose" => "Seleccionar", -"Error loading file picker template" => "Error cargando la plantilla del seleccionador de archivos", "Yes" => "Sí", "No" => "No", "Ok" => "Aceptar", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"Cancel" => "Cancelar", "The object type is not specified." => "El tipo de objeto no está especificado.", "Error" => "Error", "The app name is not specified." => "El nombre de la aplicación no está especificado.", |