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

1 files changed, 0 insertions, 2 deletions

diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index d16d1a0c3..e6409b7ff 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -37,7 +37,6 @@ $lang['btn_backlink']          = 'Linker zeréck';
 $lang['btn_backtomedia']       = 'Zeréck bei d\'Auswiel vun de Mediadateien';
 $lang['btn_profile']           = 'Profil aktualiséieren';
 $lang['btn_reset']             = 'Zerécksetzen';
-$lang['btn_resendpwd']         = 'Nei Passwuert schécken';
 $lang['btn_draft']             = 'Entworf änneren';
 $lang['btn_recover']           = 'Entworf zeréckhuelen';
 $lang['btn_draftdel']          = 'Entworf läschen';
@@ -71,7 +70,6 @@ $lang['profnoempty']           = 'En eidele Numm oder Emailadress ass net erlaab
 $lang['profchanged']           = 'Benotzerprofil erfollegräicht aktualiséiert.';
 $lang['pwdforget']             = 'Passwuert vergiess? Fro der e Neit';
 $lang['resendna']              = 'Dëse Wiki ënnerstëtzt net d\'Neiverschécke vu Passwieder.';
-$lang['resendpwd']             = 'Nei Passwuert schécke fir';
 $lang['resendpwdmissing']      = 'Du muss all Felder ausfëllen.';
 $lang['resendpwdnouser']       = 'Kann dëse Benotzer net an der Datebank fannen.';
 $lang['resendpwdbadauth']      = 'Den "Auth"-Code ass ongëlteg. Kuck no obs de dee ganze Konfirmationslink benotzt hues.';