--- smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelPassword.pm.add2general	2006-03-26 00:01:56.000000000 +0100
+++ smeserver-userpanels-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/userpanelPassword.pm	2008-04-26 21:40:06.000000000 +0200
@@ -36,7 +36,7 @@
 	my $pass1 = $fm->{cgi}->param('pass');
     unless ($pass1 eq $pass2) 
     {
-        $fm->error('PASSWORD_VERIFY_ERROR');
+        $fm->error('PASSWORD_NO_MATCH');
         return undef;
     }
     return "OK";
@@ -51,7 +51,7 @@
     my $UserName = $ENV{'REMOTE_USER'} ||'';
     unless (($UserName) = ($UserName =~ /^([a-z][\-\_\.a-z0-9]*)$/ ))
     {
-        $fm->error('TAINTED_ACCOUNT');
+        $fm->error('YOUR_ACCOUNT_INVALID_CHARS');
         return undef;
     }
 
@@ -60,26 +60,26 @@
 
     unless (($oldPass) = ($oldPass =~ /^(\S+)$/ ))
     {
-        $fm->error('TAINTED_OLDPASS');
+        $fm->error('PASSWORD_OLD_INVALID_CHARS');
         return undef;
     }
     
     unless (($pass) = ($pass =~ /^([ -~]+)$/ ))
     {
-        $fm->error('TAINTED_PASS');
+        $fm->error('PASSWORD_INVALID_CHARS');
         return undef;
     }
 
     my $acct;
     unless ($acct = $accountdb->get($UserName))
     {
-        $fm->error('NO_SUCH_USER');
+        $fm->error('YOUR_ACCOUNT_INVALID');
         return undef;
     }
 
     unless ($acct->prop('type') eq 'user')
     {
-        $fm->error('NO_SUCH_USER');
+        $fm->error('YOUR_ACCOUNT_INVALID');
         return undef;
     }
 
@@ -88,7 +88,7 @@
 		$oldPass,
 		$pass))
     {
-        $fm->error('PASSWORD_CHANGE_FAILURE');
+        $fm->error('ERROR_PASSWORD_CHANGE');
         return undef;
     }
     
@@ -101,7 +101,7 @@
         return undef;
     }
     
-    $fm->success('PASSWORD_CHANGED', 'Done');
+    $fm->success('PASSWORD_CHANGE_SUCCESS', 'Done');
 }
 
 
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password.add2general	2008-04-26 21:37:56.000000000 +0200
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-password	2008-04-26 21:45:35.000000000 +0200
@@ -1,9 +1,5 @@
 <lexicon lang="en-us">
     <entry>
-      <base>Change Password</base>
-      <trans>Change Password</trans>
-    </entry>
-    <entry>
       <base>FORM_TITLE</base>
       <trans>Change account password</trans>
     </entry>
@@ -22,48 +18,4 @@
         ]]>
       </trans>
     </entry>
-    <entry>
-      <base>ACCOUNT_NAME</base>
-      <trans>Your account: </trans>
-    </entry>
-    <entry>
-      <base>OLD_SYSTEM_PASSWORD</base>
-      <trans>Old password: </trans>
-    </entry>
-    <entry>
-      <base>NEW_SYSTEM_PASSWORD</base>
-      <trans>New password: </trans>
-    </entry>
-    <entry>
-      <base>NEW_SYSTEM_PASSWORD_VERIFY</base>
-      <trans>New password (verify): </trans>
-    </entry>
-    <entry>
-      <base>PASSWORD_VERIFY_ERROR</base>
-      <trans>The passwords you entered did not match.</trans>
-    </entry>
-    <entry>
-      <base>PASSWORD_CHANGE_FAILURE</base>
-      <trans>An error occurred while attempting to change your password.  Please make sure that the old password entered is correct.</trans>
-    </entry>
-    <entry>
-      <base>PASSWORD_CHANGED</base>
-      <trans>Your password has been successfully changed.</trans>
-    </entry>
-    <entry>
-      <base>TAINED_OLDPASS</base>
-      <trans>The old password you entered contained invalid characters.</trans>
-    </entry>
-    <entry>
-      <base>TAINED_PASS</base>
-      <trans>The password you entered contained invalid characters.</trans>
-    </entry>
-    <entry>
-      <base>TAINED_ACCOUNT</base>
-      <trans>The account name you entered contained invalid characters.</trans>
-    </entry>
-    <entry>
-      <base>NO_SUCH_USER</base>
-      <trans>The account name entered is invalid.</trans>
-    </entry>
 </lexicon>
--- smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding.add2general	2008-04-26 21:37:56.000000000 +0200
+++ smeserver-userpanels-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/userpanel-forwarding	2008-04-26 21:50:33.000000000 +0200
@@ -18,10 +18,6 @@
       </trans>
     </entry>
     <entry>
-      <base>ACCOUNT_NAME</base>
-      <trans>Your account: </trans>
-    </entry>
-    <entry>
       <base>LOCAL</base>
       <trans>Deliver email locally</trans>
     </entry>
@@ -34,10 +30,6 @@
       <trans>Both deliver locally and forward</trans>
     </entry>
     <entry>
-      <base>OK</base>
-      <trans>OK</trans>
-    </entry>
-    <entry>
       <base>UNACCEPTABLE_CHARS</base>
       <trans>Unacceptable characters, or Domain name missing.</trans>
     </entry>
@@ -57,4 +49,4 @@
       <base>SUCCESS</base>
       <trans>Your settings have been saved.</trans>
     </entry>
-</lexicon>
\ No newline at end of file
+</lexicon>
--- smeserver-userpanels-1.0/root/etc/e-smith/web/functions/userpanel-password.add2general	2006-03-16 13:36:29.000000000 +0100
+++ smeserver-userpanels-1.0/root/etc/e-smith/web/functions/userpanel-password	2008-04-26 21:42:48.000000000 +0200
@@ -2,7 +2,7 @@
 
 #----------------------------------------------------------------------
 # heading     : Your Settings
-# description : Change Password
+# description : PASSWORD_CHANGE
 # longdesc    : change your password
 # navigation  : 100 100
 
@@ -35,13 +35,13 @@
         <description>DESCRIPTION</description>
 
         <field type="password" id="oldPass" validation="nonblank" value="">
-            <label>OLD_SYSTEM_PASSWORD</label>
+            <label>PASSWORD_OLD</label>
         </field>
         <field type="password" id="pass" validation="nonblank, check_password" value="">
-            <label>NEW_SYSTEM_PASSWORD</label>
+            <label>PASSWORD_NEW</label>
         </field>
         <field type="password" id="passVerify" validation="password_compare" value="">
-            <label>NEW_SYSTEM_PASSWORD_VERIFY</label>
+            <label>PASSWORD_VERIFY_NEW</label>
         </field>
         <subroutine src="print_button('CHANGE_PASSWORD')" />
     </page>