From 753d5abf2ad5346fead21d38a291909db7542d90 Mon Sep 17 00:00:00 2001
From: Matthias Grimm <matthiasgrimm@users.sourceforge.net>
Date: Sun, 6 Nov 2005 12:02:59 +0100
Subject: en_language_update

This patch removes the autopasswd fix again, because all users may
forget their password from time to time. The wording in the dialog
changed a bit instead to make the feature more clear to the user.

Furthermore some english texts were updated.

darcs-hash:20051106110259-4145d-114d6bbfa99c347a026a17a267d3cbc39b574e98.gz
---
 inc/html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/html.php')

diff --git a/inc/html.php b/inc/html.php
index f81a2528b..cdb8692df 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -79,10 +79,10 @@ function html_login(){
       print '</p>';
     }
 
-    if (auth_canDo('modifyUser') && $conf['autopasswd']) {
+    if (auth_canDo('modifyUser')) {
       print '<p>';
       print $lang['pwdforget'];
-      print ': <a href="'.wl($ID,'do=resendpwd').'" class="wikilink1">'.$lang['resendpwd'].'</a>';
+      print ': <a href="'.wl($ID,'do=resendpwd').'" class="wikilink1">'.$lang['btn_resendpwd'].'</a>';
       print '</p>';
     }
   ?>
@@ -1164,7 +1164,7 @@ function html_resendpwd() {
   <form name="resendpwd" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>" method="post">
     <fieldset>
       <br />
-      <legend><?php echo $lang['btn_resendpwd']?></legend>
+      <legend><?php echo $lang['resendpwd']?></legend>
       <input type="hidden" name="do" value="resendpwd" />
       <input type="hidden" name="save" value="1" />
       <label class="block">
-- 
cgit v1.2.3