--- smeserver-vacation-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/uservacations.pm.add2general	2006-12-29 03:17:52.000000000 +0100
+++ smeserver-vacation-1.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/uservacations.pm	2008-04-26 22:56:24.000000000 +0200
@@ -53,11 +53,11 @@
     my $q = $self->{cgi};
 
     my @users = $adb->users;
-    return $self->localise("NO_ACCOUNTS") if (@users == 0);
+    return $self->localise("ACCOUNT_USER_NONE") if (@users == 0);
 
     my $vacation_table =
     {
-       title => $self->localise('CURRENT_LIST_OF_USERS'),
+       title => $self->localise('USER_LIST_CURRENT'),
 
        stripe => '#D4D0C8',
 
@@ -66,9 +66,9 @@
        labels => 1,
 
        field_attr => {
-                       User          => { label => $self->localise('LABEL_USER')     },
+                       User          => { label => $self->localise('ACCOUNT')     },
 
-                       FullName      => { label => $self->localise('LABEL_FULLNAME') },
+                       FullName      => { label => $self->localise('USER_NAME') },
 
                        status        => { label => $self->localise('LABEL_VACATION') },
 
--- smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations.add2general	2008-04-26 22:49:47.000000000 +0200
+++ smeserver-vacation-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/uservacations	2008-04-26 22:58:45.000000000 +0200
@@ -1,5 +1,4 @@
 <lexicon lang="en-us">
-
     <entry>
       <base>User vacations</base>
       <trans>User vacations</trans>
@@ -20,18 +19,6 @@
       </trans>
     </entry>
     <entry>
-      <base>CURRENT_LIST_OF_USERS</base>
-      <trans>Current list of users</trans>
-    </entry>
-    <entry>
-      <base>LABEL_USER</base>
-      <trans>Account</trans>
-    </entry>
-    <entry>
-      <base>LABEL_FULLNAME</base>
-      <trans>User Name</trans>
-    </entry>
-    <entry>
       <base>LABEL_VACATION</base>
       <trans>Vacation</trans>
     </entry>
@@ -65,10 +52,6 @@
       <trans>Enable vacation messages</trans>
     </entry>
     <entry>
-      <base>SUCCESS</base>
-      <trans>Success</trans>
-    </entry>
-    <entry>
       <base>FROM</base>
       <trans>From:</trans>
     </entry>
@@ -88,12 +71,4 @@
         ]]>
       </trans>
     </entry>
-    <entry>
-      <base>INVALID_USER</base>
-      <trans>Invalid user</trans>
-    </entry>
-    <entry>
-      <base>NO_ACCOUNTS</base>
-      <trans>There are no user accounts in the system.</trans>
-    </entry>
 </lexicon>
--- smeserver-vacation-1.0/root/etc/e-smith/web/functions/uservacations.add2general	2006-10-30 14:53:36.000000000 +0100
+++ smeserver-vacation-1.0/root/etc/e-smith/web/functions/uservacations	2008-04-26 22:54:38.000000000 +0200
@@ -48,11 +48,11 @@
         <description>MODIFY_DESCRIPTION</description>
 
         <field type="literal" id="User" >
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <subroutine src="get_vacation_text()" />
--- smeserver-vacation-1.0/root/etc/e-smith/web/functions/userpanel-vacation.add2general	2006-08-24 07:03:44.000000000 +0200
+++ smeserver-vacation-1.0/root/etc/e-smith/web/functions/userpanel-vacation	2008-04-26 22:54:19.000000000 +0200
@@ -41,11 +41,11 @@
         <description>MODIFY_DESCRIPTION</description>
 
         <field type="literal" id="User" value="get_panel_user()">
-            <label>LABEL_USER</label>
+            <label>ACCOUNT</label>
         </field>
 
         <field type="literal" id="FullName" value="get_full_name()">
-            <label>LABEL_FULLNAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <subroutine src="userpanel_get_vacation_text()" />