--- smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail.add2general	2008-04-26 16:09:26.000000000 +0200
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/fetchmail	2008-04-26 16:13:05.000000000 +0200
@@ -153,10 +153,6 @@
         <trans>User Account</trans>
     </entry>
     <entry>
-        <base>LABEL_USER_NAME</base>
-        <trans>User Name</trans>
-    </entry>
-    <entry>
         <base>LABEL_COPY_TO</base>
         <trans>Mail copy to</trans>
     </entry>
@@ -321,30 +317,10 @@
         <trans>Server Mailbox Password</trans>
     </entry>
     <entry>
-        <base>Collaboration</base>
-        <trans>Collaboration</trans>
-    </entry>
-    <entry>
         <base>fetchmail</base>
         <trans>Mail retrieval</trans>
     </entry>
     <entry>
-        <base>YES</base>
-        <trans>Yes</trans>
-    </entry>
-    <entry>
-        <base>NO</base>
-        <trans>No</trans>
-    </entry>
-    <entry>
-        <base>NEXT</base>
-        <trans>Next</trans>
-    </entry>
-    <entry>
-        <base>CANCEL</base>
-        <trans>Cancel</trans>
-    </entry>
-    <entry>
         <base>BLANK</base>
         <trans><![CDATA[&nbsp;]]></trans>
     </entry>
@@ -402,18 +378,6 @@
         </trans>
     </entry>
     <entry>
-        <base>CREATE</base>
-        <trans>Create</trans>
-    </entry>
-    <entry>
-        <base>MODIFY</base>
-        <trans>Modify</trans>
-    </entry>
-    <entry>
-        <base>REMOVE</base>
-        <trans>Remove</trans>
-    </entry>
-    <entry>
         <base>PREVIOUS</base>
         <trans>Previous</trans>
     </entry>
@@ -448,10 +412,6 @@
 		</trans>
     </entry>
     <entry>
-        <base>ACTION</base>
-        <trans>Action</trans>
-    </entry>
-    <entry>
         <base>STATUS_1</base>
         <trans>ENABLED</trans>
     </entry>
@@ -460,14 +420,6 @@
         <trans>DISABLED</trans>
     </entry>
 	<entry>
-	    <base>ACCOUNT</base>
-	    <trans>Account</trans>
-	</entry>
-	<entry>
-	    <base>USER_NAME</base>
-	    <trans>User name</trans>
-	</entry>
-	<entry>
 	    <base>NB_EXT_BOX</base>
 	    <trans>External Mailbox</trans>
 	</entry>
--- smeserver-fetchmail-1.3.6/root/etc/e-smith/web/functions/fetchmail.add2general	2008-04-21 08:26:10.000000000 +0200
+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/web/functions/fetchmail	2008-04-26 16:14:18.000000000 +0200
@@ -59,7 +59,7 @@
             <label>LABEL_USER_ACCOUNT</label>
         </field>
         <field type="literal" id="name" value="$q->param('name')">
-            <label>LABEL_USER_NAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field
@@ -107,7 +107,7 @@
             <label>LABEL_USER_ACCOUNT</label>
         </field>
         <field type="literal" id="name2" value="get_field('name')">
-            <label>LABEL_USER_NAME</label>
+            <label>USER_NAME</label>
         </field>
 
         <field