diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-05 21:24:21 +0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-01-05 21:24:21 +0400 |
commit | 035d0aa9d5b2768672af89ddd543913ec1f6b657 (patch) | |
tree | 32901cc0472166121c1f1a99c78c41dbb4a7d232 /core | |
parent | 5ea8adc7c7a3659fb95e9111078acf995cea39fb (diff) | |
parent | 0c6213a371059952bc2393563ad93ca74fbdddfc (diff) |
Merge branch 'master' into update-progress
Diffstat (limited to 'core')
-rw-r--r-- | core/l10n/es_AR.php | 8 | ||||
-rw-r--r-- | core/l10n/fr.php | 4 | ||||
-rw-r--r-- | core/lostpassword/controller.php | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php index 2da7951b064..830281dabbe 100644 --- a/core/l10n/es_AR.php +++ b/core/l10n/es_AR.php @@ -1,4 +1,8 @@ <?php $TRANSLATIONS = array( +"User %s shared a file with you" => "El usurario %s compartió un archivo con vos.", +"User %s shared a folder with you" => "El usurario %s compartió una carpeta con vos.", +"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s compartió el archivo \"%s\" con vos. Está disponible para su descarga aquí: %s", +"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s compartió el archivo \"%s\" con vos. Está disponible para su descarga aquí: %s", "Category type not provided." => "Tipo de categoría no provisto. ", "No category to add?" => "¿Ninguna categoría para añadir?", "This category already exists: " => "Esta categoría ya existe: ", @@ -39,6 +43,8 @@ "Share with link" => "Compartir con link", "Password protect" => "Proteger con contraseña ", "Password" => "Contraseña", +"Email link to person" => "Enviar el link por e-mail.", +"Send" => "Enviar", "Set expiration date" => "Asignar fecha de vencimiento", "Expiration date" => "Fecha de vencimiento", "Share via email:" => "compartido a través de e-mail:", @@ -55,6 +61,8 @@ "Password protected" => "Protegido por contraseña", "Error unsetting expiration date" => "Error al remover la fecha de caducidad", "Error setting expiration date" => "Error al asignar fecha de vencimiento", +"Sending ..." => "Enviando...", +"Email sent" => "Email enviado", "ownCloud password reset" => "Restablecer contraseña de ownCloud", "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}", "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 082bace76ce..6b1449dd4ba 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -59,7 +59,7 @@ "delete" => "supprimer", "share" => "partager", "Password protected" => "Protégé par un mot de passe", -"Error unsetting expiration date" => "Un erreur est survenue pendant la suppression de la date d'expiration", +"Error unsetting expiration date" => "Une erreur est survenue pendant la suppression de la date d'expiration", "Error setting expiration date" => "Erreur lors de la spécification de la date d'expiration", "Sending ..." => "En cours d'envoi ...", "Email sent" => "Email envoyé", @@ -83,7 +83,7 @@ "Cloud not found" => "Introuvable", "Edit categories" => "Modifier les catégories", "Add" => "Ajouter", -"Security Warning" => "Avertissement de sécutité", +"Security Warning" => "Avertissement de sécurité", "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL", "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.", "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web.", diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index e64b16d3b83..3ef8eaf71aa 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -45,8 +45,6 @@ class OC_Core_LostPassword_Controller { $l = OC_L10N::get('core'); $from = OCP\Util::getDefaultEmailAddress('lostpassword-noreply'); OC_Mail::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud'); - echo('Mailsent'); - self::displayLostPasswordPage(false, true); } else { self::displayLostPasswordPage(true, false); |