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/hr/lang.php b/inc/lang/hr/lang.php
index 79a6cc3b0..a0438d915 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -42,7 +42,6 @@ $lang['btn_backtomedia']       = 'Povratak na Mediafile izbornik';
 $lang['btn_subscribe']         = 'Pretplati se na promjene dokumenta';
 $lang['btn_profile']           = 'Ažuriraj profil';
 $lang['btn_reset']             = 'Poništi promjene';
-$lang['btn_resendpwd']         = 'Pošalji novu lozinku';
 $lang['btn_draft']             = 'Uredi nacrt dokumenta';
 $lang['btn_recover']           = 'Vrati prijašnji nacrt dokumenta';
 $lang['btn_draftdel']          = 'Obriši nacrt dokumenta';
@@ -77,7 +76,6 @@ $lang['profnoempty']           = 'Prazno korisničko ime ili email nisu dopušte
 $lang['profchanged']           = 'Korisnički profil je uspješno izmijenjen.';
 $lang['pwdforget']             = 'Izgubili ste lozinku? Zatražite novu';
 $lang['resendna']              = 'Ovaj wiki ne podržava ponovno slanje lozinke emailom.';
-$lang['resendpwd']             = 'Poslati novu lozinku za';
 $lang['resendpwdmissing']      = 'Ispunite sva polja.';
 $lang['resendpwdnouser']       = 'Nije moguće pronaći korisnika.';
 $lang['resendpwdbadauth']      = 'Neispravan autorizacijski kod. Provjerite da li ste koristili potpun potvrdni link.';