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/eu/lang.php b/inc/lang/eu/lang.php
index 367dfb5b5..f7a517fe4 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -40,7 +40,6 @@ $lang['btn_backtomedia']       = 'Atzera Multimedia Fitxategiaren Aukeraketara';
 $lang['btn_subscribe']         = 'Harpidetu Orri Aldaketetara';
 $lang['btn_profile']           = 'Eguneratu Profila ';
 $lang['btn_reset']             = 'Aldaketak Desegin';
-$lang['btn_resendpwd']         = 'Pasahitz berria bidali';
 $lang['btn_draft']             = 'Editatu zirriborroa';
 $lang['btn_recover']           = 'Berreskuratu zirriborroa';
 $lang['btn_draftdel']          = 'Ezabatu zirriborroa';
@@ -75,7 +74,6 @@ $lang['profnoempty']           = 'Izen edota e-posta hutsa ez dago onartua.';
 $lang['profchanged']           = 'Erabiltzaile profila arrakastaz eguneratua.';
 $lang['pwdforget']             = 'Pasahitza ahaztu duzu? Eskuratu berri bat';
 $lang['resendna']              = 'Wiki honek ez du pasahitz berbidalketa onartzen.';
-$lang['resendpwd']             = 'Bidali pasahitz berria honentzat:';
 $lang['resendpwdmissing']      = 'Barkatu, eremu guztiak bete behar dituzu.';
 $lang['resendpwdnouser']       = 'Barkatu, ez dugu erabiltzaile hori datu-basean aurkitzen';
 $lang['resendpwdbadauth']      = 'Barkatu, kautotze kodea ez da baliozkoa. Ziurtatu baieztapen esteka osoa erabili duzula.';