smeserver-fetchmail/contribs7/smeserver-fetchmail-1.3.6-add2general.patch

--- 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
1	--- 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
2	+++ 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
3	@@ -153,10 +153,6 @@
4	<trans>User Account</trans>
5	</entry>
6	<entry>
7	- <base>LABEL_USER_NAME</base>
8	- <trans>User Name</trans>
9	- </entry>
10	- <entry>
11	<base>LABEL_COPY_TO</base>
12	<trans>Mail copy to</trans>
13	</entry>
14	@@ -321,30 +317,10 @@
15	<trans>Server Mailbox Password</trans>
16	</entry>
17	<entry>
18	- <base>Collaboration</base>
19	- <trans>Collaboration</trans>
20	- </entry>
21	- <entry>
22	<base>fetchmail</base>
23	<trans>Mail retrieval</trans>
24	</entry>
25	<entry>
26	- <base>YES</base>
27	- <trans>Yes</trans>
28	- </entry>
29	- <entry>
30	- <base>NO</base>
31	- <trans>No</trans>
32	- </entry>
33	- <entry>
34	- <base>NEXT</base>
35	- <trans>Next</trans>
36	- </entry>
37	- <entry>
38	- <base>CANCEL</base>
39	- <trans>Cancel</trans>
40	- </entry>
41	- <entry>
42	<base>BLANK</base>
43	<trans><![CDATA[ ]]></trans>
44	</entry>
45	@@ -402,18 +378,6 @@
46	</trans>
47	</entry>
48	<entry>
49	- <base>CREATE</base>
50	- <trans>Create</trans>
51	- </entry>
52	- <entry>
53	- <base>MODIFY</base>
54	- <trans>Modify</trans>
55	- </entry>
56	- <entry>
57	- <base>REMOVE</base>
58	- <trans>Remove</trans>
59	- </entry>
60	- <entry>
61	<base>PREVIOUS</base>
62	<trans>Previous</trans>
63	</entry>
64	@@ -448,10 +412,6 @@
65	</trans>
66	</entry>
67	<entry>
68	- <base>ACTION</base>
69	- <trans>Action</trans>
70	- </entry>
71	- <entry>
72	<base>STATUS_1</base>
73	<trans>ENABLED</trans>
74	</entry>
75	@@ -460,14 +420,6 @@
76	<trans>DISABLED</trans>
77	</entry>
78	<entry>
79	- <base>ACCOUNT</base>
80	- <trans>Account</trans>
81	- </entry>
82	- <entry>
83	- <base>USER_NAME</base>
84	- <trans>User name</trans>
85	- </entry>
86	- <entry>
87	<base>NB_EXT_BOX</base>
88	<trans>External Mailbox</trans>
89	</entry>
90	--- smeserver-fetchmail-1.3.6/root/etc/e-smith/web/functions/fetchmail.add2general 2008-04-21 08:26:10.000000000 +0200
91	+++ smeserver-fetchmail-1.3.6/root/etc/e-smith/web/functions/fetchmail 2008-04-26 16:14:18.000000000 +0200
92	@@ -59,7 +59,7 @@
93	<label>LABEL_USER_ACCOUNT</label>
94	</field>
95	<field type="literal" id="name" value="$q->param('name')">
96	- <label>LABEL_USER_NAME</label>
97	+ <label>USER_NAME</label>
98	</field>
99
100	<field
101	@@ -107,7 +107,7 @@
102	<label>LABEL_USER_ACCOUNT</label>
103	</field>
104	<field type="literal" id="name2" value="get_field('name')">
105	- <label>LABEL_USER_NAME</label>
106	+ <label>USER_NAME</label>
107	</field>
108
109	<field