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

3 files changed, 12 insertions, 13 deletions

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">
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index a0cd67029..f5c1f1372 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -5,6 +5,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Andreas Gohr <andi@splitbrain.org>
  * @author     Anika Henke <henke@cosmocode.de>
+ * @author     Matthias Grimm <matthiasgrimm@users.sourceforge.net>
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
@@ -35,9 +36,9 @@ $lang['btn_backlink']    = "Backlinks";
 $lang['btn_backtomedia'] = 'Back to Mediafile Selection';
 $lang['btn_subscribe']   = 'Subscribe Changes';
 $lang['btn_unsubscribe'] = 'Unsubscribe Changes';
-$lang['btn_profile'] = 'Update Profile';
-$lang['btn_reset'] = 'Reset';
-$lang['btn_resendpwd'] = 'Send password';
+$lang['btn_profile']    = 'Update Profile';
+$lang['btn_reset']     = 'Reset';
+$lang['btn_resendpwd'] = 'Send new password';
 
 $lang['loggedinas'] = 'Logged in as';
 $lang['user']       = 'Username';
@@ -51,7 +52,7 @@ $lang['email']      = 'E-Mail';
 $lang['register']   = 'Register';
 $lang['profile']    = 'User Profile';
 $lang['badlogin']   = 'Sorry, username or password was wrong.';
-$lang['minoredit']  = 'Minor Edit';
+$lang['minoredit']  = 'Minor Changes';
 
 $lang['regmissing'] = 'Sorry, you must fill in all fields.';
 $lang['reguexists'] = 'Sorry, a user with this login already exists.';
@@ -67,9 +68,9 @@ $lang['profna']       = 'This wiki does not support profile modification';
 $lang['profnochange'] = 'No changes, nothing to do.';
 $lang['profnoempty']  = 'An empty name or email address is not allowed.';
 
-$lang['pwdforget'] = 'Forgotten your password? Get it resent';
+$lang['pwdforget'] = 'Forgotten your password? Get a new one';
 $lang['resendna']  = 'This wiki does not support password resending.';
-$lang['resendpwd'] = 'Resend password';
+$lang['resendpwd'] = 'Send new password for';
 $lang['resendpwdmissing'] = 'Sorry, you must fill in all fields.';
 $lang['resendpwdnouser']  = 'Sorry, we can\'t find this user in our database.';
 $lang['resendpwdsuccess'] = 'Your new password has been sent by email.';
@@ -82,7 +83,6 @@ $lang['lockexpire']   = 'Lock expires at';
 $lang['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
 
 $lang['notsavedyet'] = 'Unsaved changes will be lost.\nReally continue?';
-
 $lang['rssfailed']   = 'An error occured while fetching this feed: ';
 $lang['nothingfound']= 'Nothing was found.';
 
@@ -143,7 +143,6 @@ $lang['qb_sig']     = 'Insert Signature';
 $lang['qb_smileys'] = 'Smileys';
 $lang['qb_chars']   = 'Special Chars';
 
-
 $lang['del_confirm']= 'Delete this entry?';
 
 $lang['admin_acl']  = 'Access Control List Management...';
diff --git a/inc/lang/en/resendpwd.txt b/inc/lang/en/resendpwd.txt
index 84332b6a0..fdc3cdb21 100644
--- a/inc/lang/en/resendpwd.txt
+++ b/inc/lang/en/resendpwd.txt
@@ -1,5 +1,5 @@
-====== Send New password ======
+====== Send new password ======
 
 Fill in all the information below to get a new password for your account in this wiki.
 Your new password will be sent to your registered email address. The user name should be 
-your wiki user name.
\ No newline at end of file
+your wiki user name.