diff options
author | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:47:05 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:47:05 +0100 |
commit | 50fbf1b6522a235e93ba72c50d0f54e09506604a (patch) | |
tree | 37c31125df63879026f02df9db8a92d14061a629 /inc/lang/gl | |
parent | 7980e1acf1a671646747e5b924f2c8e208280a2e (diff) | |
parent | 8a9735e34dc99c24355e0aee74a3cd49aa3b1492 (diff) | |
download | rpg-50fbf1b6522a235e93ba72c50d0f54e09506604a.tar.gz rpg-50fbf1b6522a235e93ba72c50d0f54e09506604a.tar.bz2 |
Merge branch 'resetpassword'
No longer autogenerate passwords for password reset when
$conf['autopasswd'] is disabled. Instead allow to change the password
online.
* resetpassword:
added a timelimit for password reset tokens
removed commented line
use correct lang string for password mismatch
removed outdated language string. it has to be retranslated
German translation for password reset
honor autopasswd setting for resend password
Conflicts:
inc/lang/no/lang.php
inc/lang/sl/lang.php
Diffstat (limited to 'inc/lang/gl')
-rw-r--r-- | inc/lang/gl/lang.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php index 329820333..9636d6c15 100644 --- a/inc/lang/gl/lang.php +++ b/inc/lang/gl/lang.php @@ -40,7 +40,6 @@ $lang['btn_backtomedia'] = 'Volver á Selección de Arquivos-Media'; $lang['btn_subscribe'] = 'Avísame dos trocos na páxina'; $lang['btn_profile'] = 'Actualizar Perfil'; $lang['btn_reset'] = 'Reiniciar'; -$lang['btn_resendpwd'] = 'Envíame un novo contrasinal'; $lang['btn_draft'] = 'Editar borrador'; $lang['btn_recover'] = 'Recuperar borrador'; $lang['btn_draftdel'] = 'Eliminar borrador'; @@ -77,7 +76,6 @@ $lang['profnoempty'] = 'Non se permite un nome ou un enderezo de corre $lang['profchanged'] = 'Perfil de usuario actualizado correctamente.'; $lang['pwdforget'] = 'Esqueceches o teu contrasinal? Consegue un novo'; $lang['resendna'] = 'Este wiki non permite o reenvío de contrasinais.'; -$lang['resendpwd'] = 'Enviar novo contrasinal para'; $lang['resendpwdmissing'] = 'Sentímolo, tes que cubrir todos os campos.'; $lang['resendpwdnouser'] = 'Sentímolo, non atopamos este usuario no noso banco de datos.'; $lang['resendpwdbadauth'] = 'Sentímolo, mais este código de autorización non é válido. Asegúrate de que usaches a ligazón completa de confirmación.'; |