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/zh/lang.php b/inc/lang/zh/lang.php
index 8fffc5ed2..9d125ce44 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -50,7 +50,6 @@ $lang['btn_backtomedia']       = '返回到媒体文件选择工具';
 $lang['btn_subscribe']         = '订阅本页更改';
 $lang['btn_profile']           = '更新个人信息';
 $lang['btn_reset']             = '重设';
-$lang['btn_resendpwd']         = '发送新密码';
 $lang['btn_draft']             = '编辑草稿';
 $lang['btn_recover']           = '恢复草稿';
 $lang['btn_draftdel']          = '删除草稿';
@@ -87,7 +86,6 @@ $lang['profnoempty']           = '不允许使用空的用户名或邮件地址�
 $lang['profchanged']           = '用户信息更新成功。';
 $lang['pwdforget']             = '忘记密码？立即获取新密码';
 $lang['resendna']              = '本维基不支持二次发送密码。';
-$lang['resendpwd']             = '发送新密码给';
 $lang['resendpwdmissing']      = '对不起，您必须填写所有的区域。';
 $lang['resendpwdnouser']       = '对不起，在我们的用户数据中找不到该用户。';
 $lang['resendpwdbadauth']      = '对不起，该认证码错误。请使用完整的确认链接。';